diff options
Diffstat (limited to 'connectivity/source/drivers/jdbc')
22 files changed, 177 insertions, 193 deletions
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 3bdc4c261c66..5e30c0c17ad3 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -44,7 +44,7 @@ java_sql_Array::~java_sql_Array() jclass java_sql_Array::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched once, therefore its static if( !theClass ) theClass = findMyClass("java/sql/Array"); @@ -65,87 +65,77 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL java_sql_Array::getArray( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - jobjectArray out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - { jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); static const char * cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;"; static const char * cMethodName = "getArray"; static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - // Java-Call absetzen - out = (jobjectArray)t.pEnv->CallObjectMethod( object, mID, obj); + // submit Java-Call + (jobjectArray)t.pEnv->CallObjectMethod( object, mID, obj); ThrowSQLException(t.pEnv,*this); - // und aufraeumen + // and clean up t.pEnv->DeleteLocalRef(obj); } //t.pEnv - return ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >();//copyArrayAndDelete< ::com::sun::star::uno::Any,jobject>(t.pEnv,out); + return ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >(); } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - jobjectArray out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - { jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); static const char * cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;"; static const char * cMethodName = "getArray"; - // Java-Call absetzen + // submit Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - out = (jobjectArray)t.pEnv->CallObjectMethod( object, mID, index,count,obj); + (jobjectArray)t.pEnv->CallObjectMethod( object, mID, index,count,obj); ThrowSQLException(t.pEnv,*this); - // und aufraeumen + // and clean up t.pEnv->DeleteLocalRef(obj); - } //t.pEnv - return ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >();//copyArrayAndDelete< ::com::sun::star::uno::Any,jobject>(t.pEnv,out); + } + return ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >(); } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - jobject out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // Parameter konvertieren + // convert Parameter jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;"; static const char * cMethodName = "getResultSet"; - // Java-Call absetzen + // submit Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - out = t.pEnv->CallObjectMethod( object, mID, obj); + t.pEnv->CallObjectMethod( object, mID, obj); ThrowSQLException(t.pEnv,*this); - // und aufraeumen + // and cleanup t.pEnv->DeleteLocalRef(obj); - } //t.pEnv - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - // return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out ); + } return NULL; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - jobject out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // Parameter konvertieren + // convert parameter jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;"; static const char * cMethodName = "getResultSetAtIndex"; // Java-Call absetzen static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - out = t.pEnv->CallObjectMethod( object, mID, index,count,obj); + t.pEnv->CallObjectMethod( object, mID, index,count,obj); ThrowSQLException(t.pEnv,*this); - // und aufraeumen + // and cleanup t.pEnv->DeleteLocalRef(obj); - } //t.pEnv - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - // return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out ); + } return NULL; } diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx index a8b8f88333a7..50765fa9cba4 100644 --- a/connectivity/source/drivers/jdbc/Blob.cxx +++ b/connectivity/source/drivers/jdbc/Blob.cxx @@ -53,7 +53,7 @@ java_sql_Blob::~java_sql_Blob() jclass java_sql_Blob::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore it's static if( !theClass ) theClass = findMyClass("java/sql/Blob"); return theClass; @@ -65,10 +65,10 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "()J"; static const char * cMethodName = "length"; - // Java-Call absetzen + // submit Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); out = t.pEnv->CallLongMethod( object, mID ); @@ -82,10 +82,10 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); ::com::sun::star::uno::Sequence< sal_Int8 > aSeq; { - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(JI)[B"; static const char * cMethodName = "getBytes"; - // Java-Call absetzen + // submit Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); jbyteArray out = (jbyteArray)t.pEnv->CallObjectMethod( object, mID,pos,count); @@ -98,7 +98,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx t.pEnv->DeleteLocalRef(out); } } //t.pEnv - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return aSeq; } @@ -107,7 +107,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethod(t.pEnv,"getBinaryStream","()Ljava/io/InputStream;", mID); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_io_InputStream( t.pEnv, out ); } @@ -117,13 +117,13 @@ sal_Int64 SAL_CALL java_sql_Blob::position( const ::com::sun::star::uno::Sequenc SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "([BI)J"; static const char * cMethodName = "position"; - // Java-Call absetzen + // submit Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - // Parameter konvertieren + // convert Parameter jbyteArray pByteArray = t.pEnv->NewByteArray(pattern.getLength()); t.pEnv->SetByteArrayRegion(pByteArray,0,pattern.getLength(),(jbyte*)pattern.getConstArray()); out = t.pEnv->CallLongMethod( object, mID, pByteArray,start ); @@ -140,7 +140,7 @@ sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const ::com::sun::star::uno::R // the pattern parameter. Since the effort for proper implementation is rather high - we would need // to translated patter into a byte[] -, we defer this functionality for the moment (hey, it was // unusable, anyway) - // 2005-11-15 / #i57457# / frank.schoenheit@sun.com + // #i57457# return 0; } diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx index 5954ceae1cfe..307f6af80883 100644 --- a/connectivity/source/drivers/jdbc/Boolean.cxx +++ b/connectivity/source/drivers/jdbc/Boolean.cxx @@ -40,7 +40,7 @@ java_lang_Boolean::~java_lang_Boolean() {} jclass java_lang_Boolean::st_getMyClass() { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/lang/Boolean"); return theClass; diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index 420d6c34d813..81bb2c9859b3 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -44,7 +44,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -165,9 +164,9 @@ Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); static jmethodID mID(NULL); - /*jobject out = */callObjectMethodWithIntArg(t.pEnv,"getObject","(I)Ljava/lang/Object;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return Any(); //out==0 ? 0 : new java_lang_Object( t.pEnv, out ); + callObjectMethodWithIntArg(t.pEnv,"getObject","(I)Ljava/lang/Object;", mID, columnIndex); + // WARNING: the caller becomes the owner of the returned pointer + return Any(); } sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) @@ -195,7 +194,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) createStatement(t.pEnv); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out ? static_cast <com::sun::star::util::Time> (java_sql_Time( t.pEnv, out )) : ::com::sun::star::util::Time(); } @@ -205,7 +204,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) createStatement(t.pEnv); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out ? static_cast <com::sun::star::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime(); } @@ -218,13 +217,13 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame { createStatement(t.pEnv); - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(IILjava/lang/String;)V"; static const char * cMethodName = "registerOutParameter"; - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - // Parameter konvertieren + // Convert Parameter jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,typeName)); t.pEnv->CallVoidMethod( object, mID, parameterIndex,sqlType,str.get()); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); @@ -238,10 +237,10 @@ void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 { createStatement(t.pEnv); - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(III)V"; static const char * cMethodName = "registerOutParameter"; - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); t.pEnv->CallVoidMethod( object, mID, parameterIndex,sqlType,scale); @@ -253,7 +252,7 @@ jclass java_sql_CallableStatement::theClass = 0; jclass java_sql_CallableStatement::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/CallableStatement"); return theClass; @@ -276,7 +275,7 @@ Reference< starsdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal createStatement(t.pEnv); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getArray","(I)Ljava/sql/Array;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_Array( t.pEnv, out ); } @@ -286,7 +285,7 @@ Reference< starsdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_I createStatement(t.pEnv); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getClob","(I)Ljava/sql/Clob;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_Clob( t.pEnv, out ); } Reference< starsdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) @@ -295,7 +294,7 @@ Reference< starsdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_I createStatement(t.pEnv); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBlob","(I)Ljava/sql/Blob;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_Blob( t.pEnv, out ); } @@ -305,7 +304,7 @@ Reference< starsdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int createStatement(t.pEnv); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getRef","(I)Ljava/sql/Ref;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_Ref( t.pEnv, out ); } // ----------------------------------------------------------------------------- @@ -327,12 +326,12 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/) SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv && !object ){ - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(Ljava/lang/String;II)Ljava/sql/CallableStatement;"; static const char * cMethodName = "prepareCall"; - // Java-Call absetzen + // execute Java-Call jobject out = NULL; - // Parameter konvertieren + // convert Parameter jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,m_sSqlStatement)); static jmethodID mID(NULL); diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx index d34ead197798..b9c22e7bc955 100644 --- a/connectivity/source/drivers/jdbc/Class.cxx +++ b/connectivity/source/drivers/jdbc/Class.cxx @@ -44,7 +44,7 @@ java_lang_Class::~java_lang_Class() jclass java_lang_Class::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/lang/Class"); return theClass; @@ -58,10 +58,10 @@ java_lang_Class * java_lang_Class::forName( const ::rtl::OUString& _par0 ) { ::rtl::OString sClassName = ::rtl::OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8); sClassName = sClassName.replace('.','/'); - out = t.pEnv->FindClass(sClassName); + out = t.pEnv->FindClass(sClassName.getStr()); ThrowSQLException(t.pEnv,0); } //t.pEnv - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? NULL : new java_lang_Class( t.pEnv, out ); } diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index ed5b547b84d4..634274b238a3 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -53,7 +53,7 @@ java_sql_Clob::~java_sql_Clob() jclass java_sql_Clob::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/Clob"); return theClass; @@ -66,10 +66,10 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "()J"; static const char * cMethodName = "length"; - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); out = t.pEnv->CallLongMethod( object, mID ); @@ -84,17 +84,17 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); ::rtl::OUString aStr; { - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(JI)Ljava/lang/String;"; static const char * cMethodName = "getSubString"; - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); jstring out = (jstring)t.pEnv->CallObjectMethod( object, mID,pos,subStringLength); ThrowSQLException(t.pEnv,*this); aStr = JavaString2String(t.pEnv,out); } //t.pEnv - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return aStr; } @@ -105,7 +105,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx static jmethodID mID(NULL); jobject out = callObjectMethod(t.pEnv,"getCharacterStream","()Ljava/io/Reader;", mID); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_io_Reader( t.pEnv, out ); } @@ -117,12 +117,12 @@ sal_Int64 SAL_CALL java_sql_Clob::position( const ::rtl::OUString& searchstr, sa { jvalue args[1]; - // Parameter konvertieren + // convert Parameter args[0].l = convertwchar_tToJavaString(t.pEnv,searchstr); - // temporaere Variable initialisieren + // initialize temporary Variable static const char * cSignature = "(Ljava/lang/String;I)J"; static const char * cMethodName = "position"; - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); out = t.pEnv->CallLongMethod( object, mID, args[0].l,start ); diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 8a874f2aaf5f..4feff317369c 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -63,7 +63,7 @@ java_sql_DatabaseMetaData::~java_sql_DatabaseMetaData() jclass java_sql_DatabaseMetaData::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/DatabaseMetaData"); return theClass; @@ -130,7 +130,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); OSL_VERIFY_RES( !isExceptionOccurred(t.pEnv,sal_True),"Exception occurred!"); @@ -359,11 +359,11 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); jvalue args[5]; - // Parameter konvertieren + // convert Parameter args[0].l = catalog.hasValue() ? convertwchar_tToJavaString(t.pEnv,comphelper::getString(catalog)) : 0; args[1].l = schema.toChar() == '%' ? NULL : convertwchar_tToJavaString(t.pEnv,schema); args[2].l = convertwchar_tToJavaString(t.pEnv,table); @@ -371,7 +371,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( args[4].z = approximate; out = t.pEnv->CallObjectMethod( object, mID, args[0].l,args[1].l,args[2].l,args[3].z,args[4].z ); - // und aufraeumen + // and clean up if(catalog.hasValue()) t.pEnv->DeleteLocalRef((jstring)args[0].l); if(args[1].l) @@ -400,17 +400,17 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); jvalue args[3]; - // Parameter konvertieren + // convert Parameter args[0].l = catalog.hasValue() ? convertwchar_tToJavaString(t.pEnv,comphelper::getString(catalog)) : 0; args[1].l = schema.toChar() == '%' ? NULL : convertwchar_tToJavaString(t.pEnv,schema); args[2].l = convertwchar_tToJavaString(t.pEnv,table); out = t.pEnv->CallObjectMethod( object, mID, args[0].l,args[1].l,args[2].l,scope,nullable); - // und aufraeumen + // and cleanup if(catalog.hasValue()) t.pEnv->DeleteLocalRef((jstring)args[0].l); if(args[1].l) @@ -439,7 +439,6 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( if ( xReturn.is() ) { // we have to check the result columns for the tables privleges - // #106324# Reference< XResultSetMetaDataSupplier > xMetaSup(xReturn,UNO_QUERY); if ( xMetaSup.is() ) { @@ -517,11 +516,11 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference( SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); jvalue args[6]; - // Parameter konvertieren + // convert Parameter args[0].l = primaryCatalog.hasValue() ? convertwchar_tToJavaString(t.pEnv,comphelper::getString(primaryCatalog)) : 0; args[1].l = primarySchema.toChar() == '%' ? NULL : convertwchar_tToJavaString(t.pEnv,primarySchema); args[2].l = convertwchar_tToJavaString(t.pEnv,primaryTable); @@ -530,7 +529,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference( args[5].l = convertwchar_tToJavaString(t.pEnv,foreignTable); out = t.pEnv->CallObjectMethod( object, mID, args[0].l,args[2].l,args[2].l,args[3].l,args[4].l,args[5].l ); - // und aufraeumen + // and clean up if(primaryCatalog.hasValue()) t.pEnv->DeleteLocalRef((jstring)args[0].l); if(args[1].l) @@ -1432,12 +1431,12 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs( static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[I)Ljava/sql/ResultSet;"; static const char * cMethodName = "getUDTs"; - // Java-Call absetzen + // dismiss Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); { jvalue args[4]; - // temporaere Variable initialisieren + // initialize temporary Variable args[0].l = catalog.hasValue() ? convertwchar_tToJavaString(t.pEnv,comphelper::getString(catalog)) : 0; args[1].l = schemaPattern.toChar() == '%' ? NULL : convertwchar_tToJavaString(t.pEnv,schemaPattern); args[2].l = convertwchar_tToJavaString(t.pEnv,typeNamePattern); diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx index 258302d83783..ac61b9da9d8a 100644 --- a/connectivity/source/drivers/jdbc/Date.cxx +++ b/connectivity/source/drivers/jdbc/Date.cxx @@ -43,7 +43,7 @@ java_util_Date::~java_util_Date() jclass java_util_Date::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/util/Date"); return theClass; diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx index c4571f2f7fef..8f0d67508936 100644 --- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx @@ -32,10 +32,10 @@ #include "java/lang/Boolean.hxx" #include "java/tools.hxx" #include "java/lang/String.hxx" + using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -52,7 +52,7 @@ java_sql_DriverPropertyInfo::~java_sql_DriverPropertyInfo() // -------------------------------------------------------------------------------- jclass java_sql_DriverPropertyInfo::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/DriverPropertyInfo"); return theClass; diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx index ba65dab09b3b..330cb3eda39f 100644 --- a/connectivity/source/drivers/jdbc/Exception.cxx +++ b/connectivity/source/drivers/jdbc/Exception.cxx @@ -41,7 +41,7 @@ java_lang_Exception::~java_lang_Exception() jclass java_lang_Exception::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/lang/Exception"); return theClass; diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index 8e335d66ca2b..6db9d15d2e55 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -51,7 +51,7 @@ java_io_InputStream::~java_io_InputStream() jclass java_io_InputStream::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/io/InputStream"); return theClass; @@ -92,7 +92,7 @@ sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequen jbyteArray pByteArray = t.pEnv->NewByteArray(nBytesToRead); static const char * cSignature = "([BII)I"; static const char * cMethodName = "read"; - // Java-Call absetzen + // execute Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); out = t.pEnv->CallIntMethod( object, mID, pByteArray, 0, nBytesToRead ); diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx index 25d5837b0f5e..de48039a3543 100644 --- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx +++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx @@ -43,7 +43,7 @@ java_math_BigDecimal::~java_math_BigDecimal() jclass java_math_BigDecimal::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/math/BigDecimal"); return theClass; @@ -54,8 +54,8 @@ java_math_BigDecimal::java_math_BigDecimal( const ::rtl::OUString& _par0 ): java SDBThreadAttach t; if( !t.pEnv ) return; - // Java-Call fuer den Konstruktor absetzen - // temporaere Variable initialisieren + // Java-Call for the Constructor + // initialize temporary Variable static const char * cSignature = "(Ljava/lang/String;)V"; jobject tempObj; static jmethodID mID(NULL); @@ -67,7 +67,7 @@ java_math_BigDecimal::java_math_BigDecimal( const ::rtl::OUString& _par0 ): java saveRef( t.pEnv, tempObj ); t.pEnv->DeleteLocalRef( tempObj ); ThrowSQLException( t.pEnv, NULL ); - // und aufraeumen + // and cleanup } java_math_BigDecimal::java_math_BigDecimal( const double& _par0 ): java_lang_Object( NULL, (jobject)NULL ) @@ -75,8 +75,8 @@ java_math_BigDecimal::java_math_BigDecimal( const double& _par0 ): java_lang_Obj SDBThreadAttach t; if( !t.pEnv ) return; - // Java-Call fuer den Konstruktor absetzen - // temporaere Variable initialisieren + // Java-Call for the Constructor + // initialize temporary Variable static const char * cSignature = "(D)V"; jobject tempObj; static jmethodID mID(NULL); @@ -85,7 +85,7 @@ java_math_BigDecimal::java_math_BigDecimal( const double& _par0 ): java_lang_Obj saveRef( t.pEnv, tempObj ); t.pEnv->DeleteLocalRef( tempObj ); ThrowSQLException( t.pEnv, NULL ); - // und aufraeumen + // and cleanup } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index b61e2e6e76a4..90209d8c528b 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -325,7 +325,7 @@ void java_sql_Connection::disposing() // ------------------------------------------------------------------------- jclass java_sql_Connection::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/Connection"); return theClass; @@ -427,9 +427,9 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connecti SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); - /*jobject out = */callObjectMethod(t.pEnv,"getTypeMap","()Ljava/util/Map;", mID); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return 0;// ? 0 : Map2XNameAccess( t.pEnv, out ); + callObjectMethod(t.pEnv,"getTypeMap","()Ljava/util/Map;", mID); + // WARNING: the caller becomes the owner of the returned pointer + return 0; } // ------------------------------------------------------------------------- void SAL_CALL java_sql_Connection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) @@ -545,13 +545,13 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { - // temporaere Variable initialisieren + // initialize temporary Variable static const char * cSignature = "(Ljava/lang/String;)Ljava/lang/String;"; static const char * cMethodName = "nativeSQL"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - // Parameter konvertieren + // Convert Parameter jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,sql)); jobject out = t.pEnv->CallObjectMethod( object, mID, str.get() ); @@ -578,7 +578,7 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc SDBThreadAttach t; static jmethodID mID(NULL); jobject out = callObjectMethod(t.pEnv,"getWarnings","()Ljava/sql/SQLWarning;", mID); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer if( out ) { java_sql_SQLWarning_BASE warn_base(t.pEnv, out); @@ -819,17 +819,17 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url, if ( t.pEnv && m_Driver_theClass && m_pDriverobject ) { - // temporaere Variable initialisieren + // initialize temporary Variable static const char * cSignature = "(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;"; static const char * cMethodName = "connect"; - // Java-Call absetzen + // Java-Call static jmethodID mID = NULL; if ( !mID ) mID = t.pEnv->GetMethodID( m_Driver_theClass, cMethodName, cSignature ); if ( mID ) { jvalue args[2]; - // Parameter konvertieren + // convert Parameter args[0].l = convertwchar_tToJavaString(t.pEnv,url); java_util_Properties* pProps = createStringPropertyArray(info); args[1].l = pProps->getJavaObject(); diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 8a73592c2be8..f34c7ef05ffc 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -109,7 +109,7 @@ void SAL_CALL OStatement_BASE2::disposing() // ------------------------------------------------------------------------- jclass java_sql_Statement_Base::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/Statement"); return theClass; @@ -163,7 +163,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) jobject out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); - // temporaere Variable initialisieren + // initialize temporary Variable try { static jmethodID mID(NULL); @@ -240,13 +240,13 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const ::rtl::OUString& sql ) { createStatement(t.pEnv); m_sSqlStatement = sql; - // temporaere Variable initialisieren + // initialize temporary Variable static const char * cSignature = "(Ljava/lang/String;)Z"; static const char * cMethodName = "execute"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - // Parameter konvertieren + // convert Parameter jdbc::LocalRef< jstring > str( t.env(), convertwchar_tToJavaString( t.pEnv, sql ) ); { jdbc::ContextClassLoaderScope ccl( t.env(), @@ -275,13 +275,13 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const :: { createStatement(t.pEnv); m_sSqlStatement = sql; - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(Ljava/lang/String;)Ljava/sql/ResultSet;"; static const char * cMethodName = "executeQuery"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - // Parameter konvertieren + // convert Parameter jdbc::LocalRef< jstring > str( t.env(), convertwchar_tToJavaString( t.pEnv, sql ) ); { jdbc::ContextClassLoaderScope ccl( t.env(), @@ -294,7 +294,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const :: ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } //t.pEnv - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this ); } // ------------------------------------------------------------------------- @@ -368,7 +368,7 @@ Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base static jmethodID mID(NULL); jobject out = callResultSetMethod(t.env(),"getResultSet",mID); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this ); } // ------------------------------------------------------------------------- @@ -398,7 +398,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sd createStatement(t.pEnv); static jmethodID mID(NULL); jobject out = callObjectMethod(t.pEnv,"getWarnings","()Ljava/sql/SQLWarning;", mID); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer if( out ) { java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); @@ -758,7 +758,7 @@ java_sql_Statement::~java_sql_Statement() jclass java_sql_Statement::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/Statement"); return theClass; @@ -771,10 +771,10 @@ void java_sql_Statement::createStatement(JNIEnv* _pEnv) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); if( _pEnv && !object ){ - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(II)Ljava/sql/Statement;"; static const char * cMethodName = "createStatement"; - // Java-Call absetzen + // Java-Call jobject out = NULL; static jmethodID mID(NULL); if ( !mID ) diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 568f9aa4e1e5..e9e90e77f9fe 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -104,7 +104,7 @@ void SDBThreadAttach::releaseRef() } } // ----------------------------------------------------------------------------- -// statische Variablen der Klasse: +// static variables of the class jclass java_lang_Object::theClass = 0; jclass java_lang_Object::getMyClass() const @@ -113,14 +113,14 @@ jclass java_lang_Object::getMyClass() const theClass = findMyClass("java/lang/Object"); return theClass; } -// der eigentliche Konstruktor +// the actual constructor java_lang_Object::java_lang_Object(const Reference<XMultiServiceFactory >& _rxFactory) : m_xFactory(_rxFactory),object( 0 ) { SDBThreadAttach::addRef(); } -// der protected-Konstruktor fuer abgeleitete Klassen +// the protected-constructor for the derived classes java_lang_Object::java_lang_Object( JNIEnv * pXEnv, jobject myObj ) : object( NULL ) { @@ -155,7 +155,7 @@ void java_lang_Object::clearObject() clearObject(*t.pEnv); } } -// der protected-Konstruktor fuer abgeleitete Klassen +// the protected-constructor for the derived classes void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj ) { OSL_ENSURE( myObj, "object in c++ -> Java Wrapper" ); @@ -412,7 +412,7 @@ sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName // ----------------------------------------------------------------------------- jclass java_lang_Object::findMyClass(const char* _pClassName) { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static SDBThreadAttach t; jclass tempClass = t.pEnv->FindClass(_pClassName); OSL_ENSURE(tempClass,"Java : FindClass nicht erfolgreich!"); if(!tempClass) diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 3ca4cfbc0c29..a485372b3d66 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -73,7 +73,7 @@ java_sql_PreparedStatement::~java_sql_PreparedStatement() jclass java_sql_PreparedStatement::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/PreparedStatement"); return theClass; @@ -129,16 +129,16 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c m_aLogger.log( LogLevel::FINER, STR_LOG_STRING_PARAMETER, parameterIndex, x ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - { // temporaere Variable initialisieren + { // initialize temporary Variable createStatement(t.pEnv); static const char * cSignature = "(ILjava/lang/String;)V"; static const char * cMethodName = "setString"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,x)); t.pEnv->CallVoidMethod( object, mID, parameterIndex,str.get()); - // und aufraeumen + // and clean up ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //t.pEnv } @@ -332,10 +332,10 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter { createStatement(t.pEnv); - // temporaere Variable initialisieren + // initialize temporary Variable static const char * cSignature = "(ILjava/lang/Object;II)V"; static const char * cMethodName = "setObject"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); { @@ -375,7 +375,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter t.pEnv->CallVoidMethod( object, mID, parameterIndex,obj,targetSqlType,scale); t.pEnv->DeleteLocalRef(obj); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); - // und aufraeumen + // and clean up } //mID } //t.pEnv } @@ -430,10 +430,10 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co { createStatement(t.pEnv); - // temporaere Variable initialisieren + // initialize temporary Variable static const char * cSignature = "(I[B)V"; static const char * cMethodName = "setBytes"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); jbyteArray pByteArray = t.pEnv->NewByteArray(x.getLength()); @@ -455,10 +455,10 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete { createStatement(t.pEnv); - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(ILjava/io/InputStream;I)V"; static const char * cMethodName = "setCharacterStream"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); Sequence< sal_Int8 > aSeq; @@ -472,9 +472,9 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete args2[0].l = pByteArray; args2[1].i = 0; args2[2].i = actualLength; - // temporaere Variable initialisieren + // initialize temporary variable const char * cSignatureStream = "([BII)V"; - // Java-Call absetzen + // Java-Call jclass aClass = t.pEnv->FindClass("java/io/CharArrayInputStream"); static jmethodID mID2 = NULL; if ( !mID2 ) @@ -484,7 +484,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete tempObj = t.pEnv->NewObjectA( aClass, mID2, args2 ); t.pEnv->CallVoidMethod( object, mID, parameterIndex,tempObj,actualLength); - // und aufraeumen + // and clean up t.pEnv->DeleteLocalRef(pByteArray); t.pEnv->DeleteLocalRef(tempObj); t.pEnv->DeleteLocalRef(aClass); @@ -502,10 +502,10 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { createStatement(t.pEnv); - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(ILjava/io/InputStream;I)V"; static const char * cMethodName = "setBinaryStream"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); { @@ -521,9 +521,9 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn args2[1].i = 0; args2[2].i = (sal_Int32)actualLength; - // temporaere Variable initialisieren + // initialize temporary variable const char * cSignatureStream = "([BII)V"; - // Java-Call absetzen + // Java-Call jclass aClass = t.pEnv->FindClass("java/io/ByteArrayInputStream"); static jmethodID mID2 = NULL; if ( !mID2 ) @@ -532,7 +532,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn if(mID2) tempObj = t.pEnv->NewObjectA( aClass, mID2, args2 ); t.pEnv->CallVoidMethod( object, mID, parameterIndex,tempObj,(sal_Int32)actualLength); - // und aufraeumen + // and clean up t.pEnv->DeleteLocalRef(pByteArray); t.pEnv->DeleteLocalRef(tempObj); t.pEnv->DeleteLocalRef(aClass); @@ -630,14 +630,14 @@ void java_sql_PreparedStatement::createStatement(JNIEnv* _pEnv) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); if( !object && _pEnv ){ - // temporaere Variable initialisieren + // initialize temporary variable static const char * cSignature = "(Ljava/lang/String;II)Ljava/sql/PreparedStatement;"; static const char * cMethodName = "prepareStatement"; jvalue args[1]; - // Parameter konvertieren + // convert Parameter args[0].l = convertwchar_tToJavaString(_pEnv,m_sSqlStatement); - // Java-Call absetzen + // Java-Call jobject out = NULL; static jmethodID mID(NULL); if ( !mID ) diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index 12ec9e8f9cd5..3415122d8ce6 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -49,7 +49,7 @@ java_io_Reader::~java_io_Reader() jclass java_io_Reader::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/io/Reader"); return theClass; @@ -74,7 +74,7 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::Not { static const char * cSignature = "()Z"; static const char * cMethodName = "available"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); out = t.pEnv->CallBooleanMethod( object, mID); @@ -99,7 +99,7 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< s jcharArray pCharArray = t.pEnv->NewCharArray(nBytesToRead); static const char * cSignature = "([CII)I"; static const char * cMethodName = "read"; - // Java-Call absetzen + // Java-Call static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); out = t.pEnv->CallIntMethod( object, mID, pCharArray, 0, nBytesToRead ); diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx index cb86ebd08c9b..7d30e94c23b1 100644 --- a/connectivity/source/drivers/jdbc/Ref.cxx +++ b/connectivity/source/drivers/jdbc/Ref.cxx @@ -48,7 +48,7 @@ java_sql_Ref::~java_sql_Ref() jclass java_sql_Ref::getMyClass() const { - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/Ref"); return theClass; diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index b2d72cb24d50..09e28dbac4c1 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -65,7 +65,6 @@ using namespace ::comphelper; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -105,7 +104,7 @@ java_sql_ResultSet::~java_sql_ResultSet() jclass java_sql_ResultSet::getMyClass() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getMyClass" ); - // die Klasse muss nur einmal geholt werden, daher statisch + // the class must be fetched only once, therefore static if( !theClass ) theClass = findMyClass("java/sql/ResultSet"); return theClass; @@ -162,7 +161,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBinaryStream","(I)Ljava/io/InputStream;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_io_InputStream( t.pEnv, out ); } // ------------------------------------------------------------------------- @@ -173,7 +172,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getCharacterStream","(I)Ljava/io/Reader;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_io_Reader( t.pEnv, out ); } // ------------------------------------------------------------------------- @@ -219,7 +218,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out ? static_cast <com::sun::star::util::Date> (java_sql_Date( t.pEnv, out )) : ::com::sun::star::util::Date(); } // ------------------------------------------------------------------------- @@ -284,7 +283,7 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getArray","(I)Ljava/sql/Array;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_Array( t.pEnv, out ); } // ------------------------------------------------------------------------- @@ -295,7 +294,7 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getClob","(I)Ljava/sql/Clob;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_Clob( t.pEnv, out ); } // ------------------------------------------------------------------------- @@ -305,7 +304,7 @@ Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBlob","(I)Ljava/sql/Blob;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_Blob( t.pEnv, out ); } // ------------------------------------------------------------------------- @@ -317,7 +316,7 @@ Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) t static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getRef","(I)Ljava/sql/Ref;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_Ref( t.pEnv, out ); } // ------------------------------------------------------------------------- @@ -330,11 +329,11 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { jvalue args[2]; - // Parameter konvertieren + // convert parameter args[0].i = (sal_Int32)columnIndex; args[1].l = convertTypeMapToJavaMap(t.pEnv,typeMap); - // temporaere Variable initialisieren - // Java-Call absetzen + // initialize temporary Variable + // Java-Call static jmethodID mID(NULL); if ( !mID ) { @@ -347,7 +346,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen out = t.pEnv->CallObjectMethodA( object, mID, args); t.pEnv->DeleteLocalRef((jstring)args[1].l); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); - // und aufraeumen + // and clean up if ( out ) { if ( t.pEnv->IsInstanceOf(out,java_lang_String::st_getMyClass()) ) @@ -409,7 +408,7 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out ? static_cast <com::sun::star::util::Time> (java_sql_Time( t.pEnv, out )) : ::com::sun::star::util::Time(); } // ------------------------------------------------------------------------- @@ -421,7 +420,7 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer return out ? static_cast <com::sun::star::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime(); } // ------------------------------------------------------------------------- @@ -579,7 +578,7 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc SDBThreadAttach t; static jmethodID mID(NULL); jobject out = callObjectMethod(t.pEnv,"getWarnings","()Ljava/sql/SQLWarning;", mID); - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! + // WARNING: the caller becomes the owner of the returned pointer if( out ) { java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); @@ -707,8 +706,8 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::r { - // temporaere Variable initialisieren - // Java-Call absetzen + // initialize temporary variable + // Java-Call static jmethodID mID(NULL); if ( !mID ) { @@ -719,7 +718,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::r } { - // Parameter konvertieren + // convert parameter jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,x)); t.pEnv->CallVoidMethod( object, mID,columnIndex,str.get()); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); @@ -734,8 +733,8 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co SDBThreadAttach t; { - // temporaere Variable initialisieren - // Java-Call absetzen + // initialize temporary variable + // Java-Call static jmethodID mID(NULL); if ( !mID ) { @@ -748,7 +747,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co { jbyteArray aArray = t.pEnv->NewByteArray(x.getLength()); t.pEnv->SetByteArrayRegion(aArray,0,x.getLength(),(jbyte*)x.getConstArray()); - // Parameter konvertieren + // convert parameter t.pEnv->CallVoidMethod( object, mID,columnIndex,aArray); t.pEnv->DeleteLocalRef(aArray); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); @@ -792,8 +791,8 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con SDBThreadAttach t; { - // temporaere Variable initialisieren - // Java-Call absetzen + // initialize temporary variable + // Java-Call static jmethodID mID(NULL); if ( !mID ) { @@ -803,7 +802,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con } { - // Parameter konvertieren + // convert Parameter jobject obj = createByteInputStream(x,length); t.pEnv->CallVoidMethod( object, mID, columnIndex,obj,length); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); @@ -824,8 +823,8 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, SDBThreadAttach t; { - // temporaere Variable initialisieren - // Java-Call absetzen + // initialize temporary variable + // Java-Call static jmethodID mID(NULL); if ( !mID ) { @@ -835,7 +834,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, } { - // Parameter konvertieren + // convert Parameter jobject obj = createCharArrayReader(x,length); t.pEnv->CallVoidMethod( object, mID, columnIndex,obj,length); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); @@ -873,8 +872,8 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co { - // temporaere Variable initialisieren - // Java-Call absetzen + // initialize temporary variable + // Java-Call static jmethodID mID(NULL); if ( !mID ) { @@ -885,7 +884,7 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co } { - // Parameter konvertieren + // convert parameter double nTemp = 0.0; ::std::auto_ptr<java_math_BigDecimal> pBigDecimal; if ( x >>= nTemp) @@ -894,7 +893,7 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co } else pBigDecimal.reset(new java_math_BigDecimal(::comphelper::getString(x))); - //obj = convertwchar_tToJavaString(t.pEnv,::comphelper::getString(x)); + t.pEnv->CallVoidMethod( object, mID, columnIndex,pBigDecimal->getJavaObject(),scale); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index c922f77f4664..3d64d67630e8 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -36,7 +36,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx index 0a9e2712d070..6df28a63b63b 100644 --- a/connectivity/source/drivers/jdbc/SQLException.cxx +++ b/connectivity/source/drivers/jdbc/SQLException.cxx @@ -34,7 +34,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index b8c0c8e75051..ae5672b3406f 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -41,7 +41,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; |