yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

zip fixes

Browse source 
library speed up
code simplification


git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@942 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
This commit is contained in:
Nikolay Pultsin 2009-04-19 20:11:37 +00:00
parent f22d805f8d
commit 8cdec4f09d
28 changed files with 363 additions and 476 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/org/amse/ys/zip/ZipFile.java
View file

@ -20,7 +20,6 @@ public final class ZipFile {
try {
readAllHeaders();
} catch (IOException e) {
} catch (WrongZipFormatException e) {
}
return myFileHeaders.values();
}
@ -50,7 +49,7 @@ public final class ZipFile {
return fileName.equals(fileToFind);
}
private void readAllHeaders() throws IOException, WrongZipFormatException {
private void readAllHeaders() throws IOException {
if (myAllFilesAreRead) {
return;
}
@ -67,7 +66,7 @@ public final class ZipFile {
if (header == LocalFileHeader.FOLDER_HEADER_SIGNATURE) {
break; // central directory, no more files
} else {
throw new WrongZipFormatException(
throw new ZipException(
"readHeaders. Wrong signature found = " + header
+ " at position " + baseStream.offset());
}
@ -88,7 +87,7 @@ public final class ZipFile {
do {
int nextByte = baseStream.read();
if (nextByte < 0) {
throw new IOException(
throw new ZipException(
"readFileHeaders. Unexpected end of file when looking for DataDescriptor");
}
signature = ((signature << 8) & (0x0FFFFFFFF)) + (byte) nextByte;
@ -117,7 +116,7 @@ public final class ZipFile {
return (baseStream != null) ? baseStream : new MyBufferedInputStream(myFileName);
}
private ZipInputStream createZipInputStream(LocalFileHeader header) throws IOException, WrongZipFormatException {
private ZipInputStream createZipInputStream(LocalFileHeader header) throws IOException {
return new ZipInputStream(this, header);
}
@ -125,11 +124,7 @@ public final class ZipFile {
if (!myFileHeaders.isEmpty()) {
LocalFileHeader header = myFileHeaders.get(entryName);
if (header != null) {
try {
return createZipInputStream(header);
} catch (WrongZipFormatException e) {
return null;
}
return createZipInputStream(header);
}
if (myAllFilesAreRead) {
return null;
@ -145,7 +140,7 @@ public final class ZipFile {
if (signature == LocalFileHeader.FOLDER_HEADER_SIGNATURE) {
break; // central directory, no more files
} else {
throw new IOException(
throw new ZipException(
"Wrong signature " + signature
+ " found at position " + baseStream.offset());
}
@ -155,7 +150,7 @@ public final class ZipFile {
if (header != null) {
try {
return createZipInputStream(header);
} catch (WrongZipFormatException e) {
} catch (ZipException e) {
}
}
} finally {