Context Navigation

Common

Timestamp:

2013-06-21T01:21:01+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] .7z archive read support: remove unused code

Location:

Files:

-              r29679
+              r29681
             _value = Table[(_value ^ data[i]) & 0xFF] ^ (_value >>> 8);
+    }
+    public void Update(byte[] data) {
+        for (int i = 0; i < data.length; i++)
+            _value = Table[(_value ^ data[i]) & 0xFF] ^ (_value >>> 8);
+    }
     public void Update(byte[] data, int offset, int size) {
         for (int i = 0; i < size; i++)

-              r29679
+              r29681
         return elt == 0;
+    }
-    public int Back() {
-        if (elt < 1)
-            throw new ArrayIndexOutOfBoundsException(0);
-        return data[elt-1];
+    }
-    public int Front() {
-        if (elt < 1)
-            throw new ArrayIndexOutOfBoundsException(0);
-        return data[0];
+    }
-    public void DeleteBack() {
-        // Delete(_size - 1);
-        remove(elt-1);
+    }
-    public int remove(int index) {
-        if (index >= elt)
-            throw new ArrayIndexOutOfBoundsException(index);
-        int oldValue = data[index];
-        int numMoved = elt - index - 1;
-        if (numMoved > 0)
-            System.arraycopy(elt, index+1, elt, index,numMoved);
-        // data[--elt] = null; // Let gc do its work
-        return oldValue;
+    }
+}

-              r29679
+              r29681
     long _size;
     long _pos;
-    boolean _wasFinished;
     public LimitedSequentialInStream() {
 …
         _size = streamSize;
         _pos = 0;
-        _wasFinished = false;
+    }
     public int read() throws java.io.IOException {
         int ret = _stream.read();
-        if (ret == -1) _wasFinished = true;
         return ret;
+    }
 …
             int realProcessedSize = _stream.read(data, off, sizeToRead);
             if (realProcessedSize == -1) {
-                _wasFinished = true;
                 return -1;
+            }

-              r29679
+              r29681
         _stream = stream;
+    }
+    /* really too slow, don't use !
+    public synchronized int read(long startPos) throws java.io.IOException
+    {
+        // NWindows::NSynchronization::CCriticalSectionLock lock(_criticalSection);
+        _stream.Seek(startPos, IInStream.STREAM_SEEK_SET);
+        return _stream.read();
+    }
+     */
+    public synchronized int read(long startPos, byte  [] data, int size) throws java.io.IOException {
+        // NWindows::NSynchronization::CCriticalSectionLock lock(_criticalSection);
+        _stream.Seek(startPos, IInStream.STREAM_SEEK_SET);
+        return _stream.read(data,0, size);
+    }
     public synchronized int read(long startPos, byte  [] data, int off, int size) throws java.io.IOException {
         // NWindows::NSynchronization::CCriticalSectionLock lock(_criticalSection);

-              r29679
+              r29681
         return get(elementCount-1);
+    }
-    public E Front() {
-        return get(0);
+    }
-    public void DeleteBack() {
-        remove(elementCount-1);
+    }
+}

Note: See TracChangeset for help on using the changeset viewer.