refac: PackFileEntry -> PackFile.Entry

src/lwjake2/qcommon/FS.java

@@ -24,7 +24,6 @@ import lwjake2.game.Cmd;
 import lwjake2.game.cvar_t;
 import lwjake2.sys.Sys;
 import ru.di9.lwjake2.PackFile;
-import ru.di9.lwjake2.PackFileEntry;
 import ru.di9.lwjake2.PackLoader;
 
 import java.io.File;
@@ -170,7 +169,7 @@ public final class FS extends Globals {
                 // look through all the pak file elements
                 pak = search.pack;
                 filename = filename.toLowerCase();
-                PackFileEntry entry = pak.getFiles().get(filename);
+                PackFile.Entry entry = pak.getFiles().get(filename);
 
                 if (entry != null) {
                     // found it!
@@ -245,7 +244,7 @@ public final class FS extends Globals {
                 // look through all the pak file elements
                 pak = search.pack;
                 filename = filename.toLowerCase();
-                PackFileEntry entry = pak.getFiles().get(filename);
+                PackFile.Entry entry = pak.getFiles().get(filename);
 
                 if (entry != null) {
                     // found it!
@@ -407,7 +406,7 @@ public final class FS extends Globals {
                     // look through all the pak file elements
                     pak = search.pack;
                     filename = filename.toLowerCase();
-                    PackFileEntry entry = pak.getFiles().get(filename);
+                    PackFile.Entry entry = pak.getFiles().get(filename);
 
                     if (entry != null) {
                         // found it!

src/ru/di9/lwjake2/PackFile.java

@@ -8,11 +8,11 @@ public class PackFile {
     private final String filename;
     private final int numFiles;
 
-    private Map<String, PackFileEntry> files;
+    private Map<String, Entry> files;
     private RandomAccessFile handle;
     private ByteBuffer backBuffer;
 
-    public PackFile(String filename, RandomAccessFile handle, int numFiles, Map<String, PackFileEntry> files) {
+    public PackFile(String filename, RandomAccessFile handle, int numFiles, Map<String, Entry> files) {
         this.filename = filename;
         this.handle = handle;
         this.numFiles = numFiles;
@@ -35,11 +35,11 @@ public class PackFile {
         this.handle = handle;
     }
 
-    public Map<String, PackFileEntry> getFiles() {
+    public Map<String, Entry> getFiles() {
         return files;
     }
 
-    public void setFiles(Map<String, PackFileEntry> files) {
+    public void setFiles(Map<String, Entry> files) {
         this.files = files;
     }
 
@@ -50,4 +50,33 @@ public class PackFile {
     public void setBackBuffer(ByteBuffer backBuffer) {
         this.backBuffer = backBuffer;
     }
+
+    public static class Entry {
+        private final String name;
+        private final int filePos;
+        private final int fileLen;
+
+        public Entry(String name, int filePos, int fileLen) {
+            this.name = name;
+            this.filePos = filePos;
+            this.fileLen = fileLen;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public int getFilePos() {
+            return filePos;
+        }
+
+        public int getFileLen() {
+            return fileLen;
+        }
+
+        @Override
+        public String toString() {
+            return name + " [ length: " + fileLen + " pos: " + filePos + " ]";
+        }
+    }
 }

src/ru/di9/lwjake2/PackFileEntry.java

@@ -1,30 +0,0 @@
-package ru.di9.lwjake2;
-
-public class PackFileEntry {
-    private final String name;
-    private final int filePos;
-    private final int fileLen;
-
-    public PackFileEntry(String name, int filePos, int fileLen) {
-        this.name = name;
-        this.filePos = filePos;
-        this.fileLen = fileLen;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getFilePos() {
-        return filePos;
-    }
-
-    public int getFileLen() {
-        return fileLen;
-    }
-
-    @Override
-    public String toString() {
-        return name + " [ length: " + fileLen + " pos: " + filePos + " ]";
-    }
-}

src/ru/di9/lwjake2/PackLoader.java

@@ -53,10 +53,10 @@ public class PackLoader {
             throw new IOException(file + " has " + numPackFiles + " files");
         }
 
-        Map<String, PackFileEntry> newFiles = new HashMap<>(numPackFiles);
+        Map<String, PackFile.Entry> newFiles = new HashMap<>(numPackFiles);
         packHandle.position(headerDirofs);
 
-        PackFileEntry entry;
+        PackFile.Entry entry;
         byte[] tmpBuff = new byte[NAME_SIZE];
         for (int i = 0; i < numPackFiles; i++) {
             packHandle.get(tmpBuff);
@@ -64,7 +64,7 @@ public class PackLoader {
             String name = new String(tmpBuff).trim();
             int filePos = packHandle.getInt();
             int fileLen = packHandle.getInt();
-            entry = new PackFileEntry(name, filePos, fileLen);
+            entry = new PackFile.Entry(name, filePos, fileLen);
 
             newFiles.put(entry.getName().toLowerCase(), entry);
         }