diff options
author | Luke Symes <allsymes@gmail.com> | 2010-10-17 09:13:35 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2010-10-17 09:13:35 +0200 |
commit | 69fc4c22e9e2b8311532f4ed9ed3c035e85797c8 (patch) | |
tree | 9a7b15609ce497166ffdedcf6c1f6ac283610b47 /connectivity/com | |
parent | 4a624e6e78a5f7228a04779d22656d58a1648bac (diff) |
cleanup some more dead code under connectivity
Diffstat (limited to 'connectivity/com')
-rw-r--r-- | connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java index 9471275e7e44..6797ab39290b 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java @@ -24,25 +24,14 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* - * StorageAccess.java - * - * Created on 17. August 2004, 13:32 - */ package com.sun.star.sdbcx.comp.hsqldb; -/** - * - * @author oj93728 - */ - public class StorageAccess implements org.hsqldb.lib.Storage { String key; String name; boolean readonly; NativeStorageAccess access; -// public SimpleLog appLog; /** Creates a new instance of StorageAccess */ public StorageAccess(String name,Boolean readonly,Object key) throws java.io.IOException{ this.key = (String)key; @@ -55,37 +44,29 @@ public class StorageAccess implements org.hsqldb.lib.Storage { } catch(Exception e){ throw new java.io.IOException(); } - // appLog = new SimpleLog(name +".app3.log", true); } public void close() throws java.io.IOException{ - //appLog.sendLine("NIOScaledRAFile.close() "); - //appLog.close(); access.close(name,key); } public long getFilePointer() throws java.io.IOException{ - //appLog.sendLine("NIOScaledRAFile.getFilePointer() "); return access.getFilePointer(name,key); } public long length() throws java.io.IOException{ - //appLog.sendLine("NIOScaledRAFile.length() "); return access.length(name,key); } public int read() throws java.io.IOException{ - //appLog.sendLine("NIOScaledRAFile.read() "); return access.read(name,key); } public void read(byte[] b, int off, int len) throws java.io.IOException{ - //appLog.sendLine("NIOScaledRAFile.read(" + b + ","+ off +","+len + ") "); access.read(name,key,b,off,len); } - // fredt - this is based on the same code that reads an int from the .data file in HSQLDB + // based on the same code that reads an int from the .data file in HSQLDB public int readInt() throws java.io.IOException{ - //appLog.sendLine("NIOScaledRAFile.readInt() "); byte [] tmp = new byte [4]; int count = access.read(name,key,tmp,0, 4); @@ -101,35 +82,17 @@ public class StorageAccess implements org.hsqldb.lib.Storage { int ch3 = tmp[count] & 0xff; return ((ch0 << 24) + (ch1 << 16) + (ch2 << 8) + (ch3)); - -/* - int ch [] = new int[4]; - for(int i = 0;i < 4; ++i){ - ch[i] = tmp[i]; - if (ch[i] < 0 ){ - ch[i] = 256 + ch[i]; - } - } - - if ((ch[0] | ch[1] | ch[2] | ch[3]) < 0) - throw new java.io.IOException(); - return ((ch[0] << 24) + (ch[1] << 16) + (ch[2] << 8) + (ch[3] << 0)); - //return access.readInt(name,key); -*/ } public void seek(long position) throws java.io.IOException{ - //appLog.sendLine("NIOScaledRAFile.seek("+position +") "); access.seek(name,key,position); } public void write(byte[] b, int offset, int length) throws java.io.IOException{ - //appLog.sendLine("NIOScaledRAFile.write(" + b + "," + offset +","+length+") "); access.write(name,key,b,offset,length); } public void writeInt(int v) throws java.io.IOException{ - //appLog.sendLine("NIOScaledRAFile.writeInt(" +v+") "); byte [] oneByte = new byte [4]; oneByte[0] = (byte) ((v >>> 24) & 0xFF); oneByte[1] = (byte) ((v >>> 16) & 0xFF); @@ -143,9 +106,7 @@ public class StorageAccess implements org.hsqldb.lib.Storage { return readonly; } - // fredt - minor change of brackets public long readLong() throws java.io.IOException { - // return ((long)(readInt()) << 32) + (readInt() & 0xFFFFFFFFL); return (((long) readInt()) << 32) + (((long) readInt()) & 0xFFFFFFFFL); } @@ -154,7 +115,6 @@ public class StorageAccess implements org.hsqldb.lib.Storage { } public void writeLong(long v) throws java.io.IOException { - //appLog.sendLine("NIOScaledRAFile.writeLong(" +v+") "); byte [] oneByte = new byte [8]; oneByte[0] = (byte) ((v >>> 56) & 0xFF); |