Simplify PK find

Author: Col-E

src/main/java/software/coley/llzip/part/JvmLocalFileHeader.java

@@ -1,5 +1,8 @@
 package software.coley.llzip.part;
 
+import software.coley.llzip.ZipPatterns;
+import software.coley.llzip.util.Array;
+
 import java.util.Arrays;
 
 /**
@@ -10,24 +13,16 @@
  * @author Wolfie / win32kbase <i>(Reverse engineering JVM specific zip handling)</i>
  */
 public class JvmLocalFileHeader extends LocalFileHeader {
-	private final int nextPkPos;
-
-	/**
-	 * @param nextPkPos
-	 * 		Next offset of any {@link ZipPart}.
-	 * 		May also be the position of the end of the file.
-	 */
-	public JvmLocalFileHeader(int nextPkPos) {
-		this.nextPkPos = nextPkPos;
-	}
-
 	@Override
 	public void read(byte[] data, int offset) {
 		super.read(data, offset);
 		int start = offset + 30 + getFileNameLength() + getExtraFieldLength();
 		// JVM file data reading does NOT use the compressed/uncompressed fields.
 		// Instead, it scans data until the next header/EOF.
-		byte[] fileData = Arrays.copyOfRange(data, start, nextPkPos);
+		int nextPk = Array.indexOf(data, offset + 1, ZipPatterns.PK);
+		if (nextPk == -1)
+			nextPk = data.length;
+		byte[] fileData = Arrays.copyOfRange(data, start, nextPk);
 		setFileData(fileData);
 	}
 }

src/main/java/software/coley/llzip/strategy/JvmZipReaderStrategy.java

@@ -85,12 +85,8 @@ else if (Array.startsWith(data, jvmBaseOffset, ZipPatterns.CENTRAL_DIRECTORY_FIL
 			int offset = jvmBaseOffset + directory.getRelativeOffsetOfLocalHeader();
 			if (!offsets.contains(offset) && Array.startsWith(data, offset, ZipPatterns.LOCAL_FILE_HEADER)) {
 				// JVM local file header needs to be aware of where the NEXT entry is.
-				int nextPk = Array.indexOf(data, offset + 1, ZipPatterns.PK);
-				if (nextPk == -1) {
-					nextPk = data.length;
-				}
 				try {
-					JvmLocalFileHeader file = new JvmLocalFileHeader(nextPk);
+					JvmLocalFileHeader file = new JvmLocalFileHeader();
 					file.read(data, offset);
 					zip.getParts().add(file);
 					directory.link(file);