Tag: cws_dev300_dba31a User: oj Date: 2008-06-05 12:11:08+0000 Modified: dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
Log: #i75164# remove dep from unoil File Changes: Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ ============================================================ File [changed]: NativeLibraries.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java?r1=1.3&r2=1.3.32.1 Delta lines: +3 -3 ------------------- --- NativeLibraries.java 2008-04-10 07:28:04+0000 1.3 +++ NativeLibraries.java 2008-06-05 12:11:05+0000 1.3.32.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: NativeLibraries.java,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.32.1 $ * * This file is part of OpenOffice.org. * @@ -68,7 +68,7 @@ newInstance( new Object[] { URL.class.getMethod("toURI", new Class[0]). - invoke(url, null) })). + invoke(url, (java.lang.Object)null) })). getAbsolutePath()); } catch (Throwable t) { throw new UnsatisfiedLinkError( File [changed]: NativeStorageAccess.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java?r1=1.8&r2=1.8.32.1 Delta lines: +11 -5 -------------------- --- NativeStorageAccess.java 2008-04-10 07:28:19+0000 1.8 +++ NativeStorageAccess.java 2008-06-05 12:11:05+0000 1.8.32.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: NativeStorageAccess.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.1 $ * * This file is part of OpenOffice.org. * @@ -39,17 +39,23 @@ * * @author oj93728 */ -import com.sun.star.embed.ElementModes; public class NativeStorageAccess { static { NativeLibraries.load(); } + public static final int READ = 1; + public static final int SEEKABLE = 2; + public static final int SEEKABLEREAD = 3; + public static final int WRITE = 4; + public static final int READWRITE = 7; + public static final int TRUNCATE = 8; + /** Creates a new instance of StorageAccess */ public NativeStorageAccess(String name,String _mode,Object key) throws java.io.IOException{ try { - int mode = ElementModes.SEEKABLEREAD; + int mode = NativeStorageAccess.SEEKABLEREAD; if ( _mode.equals("rw") ) - mode = ElementModes.READWRITE | ElementModes.SEEKABLE; + mode = NativeStorageAccess.READWRITE | NativeStorageAccess.SEEKABLE; openStream(name, (String)key, mode); } catch(Exception e){ File [changed]: StorageNativeInputStream.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java?r1=1.5&r2=1.5.68.1 Delta lines: +2 -2 ------------------- --- StorageNativeInputStream.java 2008-01-07 09:46:04+0000 1.5 +++ StorageNativeInputStream.java 2008-06-05 12:11:05+0000 1.5.68.1 @@ -5,7 +5,7 @@ */ package com.sun.star.sdbcx.comp.hsqldb; -import com.sun.star.embed.ElementModes; + /** * * @author Ocke @@ -15,7 +15,7 @@ /** Creates a new instance of StorageNativeInputStream */ public StorageNativeInputStream(String key,String _file) { - openStream(key,_file, ElementModes.READ); + openStream(key,_file, NativeStorageAccess.READ); } public native void openStream(String key,String name, int mode); public native int read(String key,String name) throws java.io.IOException; File [changed]: StorageNativeOutputStream.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java?r1=1.6&r2=1.6.68.1 Delta lines: +2 -2 ------------------- --- StorageNativeOutputStream.java 2008-01-07 09:46:15+0000 1.6 +++ StorageNativeOutputStream.java 2008-06-05 12:11:05+0000 1.6.68.1 @@ -5,7 +5,7 @@ */ package com.sun.star.sdbcx.comp.hsqldb; -import com.sun.star.embed.ElementModes; + /** * * @author oj93728 @@ -20,7 +20,7 @@ public StorageNativeOutputStream(String _name,Object _key) { name = _name; key = _key; - openStream(name, (String)key, ElementModes.WRITE | ElementModes.TRUNCATE); + openStream(name, (String)key, NativeStorageAccess.WRITE | NativeStorageAccess.TRUNCATE); } public native void openStream(String name,String key, int mode); File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk?r1=1.15&r2=1.15.32.1 Delta lines: +2 -3 ------------------- --- makefile.mk 2008-04-10 07:29:04+0000 1.15 +++ makefile.mk 2008-06-05 12:11:05+0000 1.15.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.15.32.1 $ # # This file is part of OpenOffice.org. # @@ -41,7 +41,6 @@ # --- Files -------------------------------------------------------- -JARFILES = unoil.jar .IF "$(SYSTEM_HSQLDB)" == "YES" XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR) .ELSE --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
