go

[Dictionary.git] / src / com / hughes / android / dictionary / Dictionary.java

diff --git a/src/com/hughes/android/dictionary/Dictionary.java b/src/com/hughes/android/dictionary/Dictionary.java
index d8fd3c6b3bd95d6bc8e5d7e1cc806d4ca7944cbb..3133e281dcdd82b33436361ede4f92939ec40296 100755 (executable)
--- a/src/com/hughes/android/dictionary/Dictionary.java
+++ b/src/com/hughes/android/dictionary/Dictionary.java
@@ -7,12 +7,12 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;\r
 \r
 import com.hughes.util.CachingList;\r
-import com.hughes.util.raf.FileList;\r
+import com.hughes.util.raf.RAFList;\r
 import com.hughes.util.raf.RAFFactory;\r
 import com.hughes.util.raf.RAFSerializable;\r
 import com.hughes.util.raf.RAFSerializableSerializer;\r
 import com.hughes.util.raf.RAFSerializer;\r
-import com.hughes.util.raf.UniformFileList;\r
+import com.hughes.util.raf.UniformRAFList;\r
 \r
 public final class Dictionary implements RAFSerializable<Dictionary> {\r
   \r
@@ -40,8 +40,8 @@ public final class Dictionary implements RAFSerializable<Dictionary> {
 \r
   public Dictionary(final RandomAccessFile raf) throws IOException {\r
     dictionaryInfo = raf.readUTF();\r
-    sources = new ArrayList<String>(FileList.create(raf, RAFSerializer.STRING, raf.getFilePointer()));\r
-    entries = CachingList.create(FileList.create(raf, ENTRY_SERIALIZER, raf\r
+    sources = new ArrayList<String>(RAFList.create(raf, RAFSerializer.STRING, raf.getFilePointer()));\r
+    entries = CachingList.create(RAFList.create(raf, ENTRY_SERIALIZER, raf\r
         .getFilePointer()), 10000);\r
     languageDatas[0] = new LanguageData(this, raf, SimpleEntry.LANG1);\r
     languageDatas[1] = new LanguageData(this, raf, SimpleEntry.LANG2);\r
@@ -53,8 +53,8 @@ public final class Dictionary implements RAFSerializable<Dictionary> {
 \r
   public void write(RandomAccessFile raf) throws IOException {\r
     raf.writeUTF(dictionaryInfo);\r
-    FileList.write(raf, sources, RAFSerializer.STRING);\r
-    FileList.write(raf, entries, ENTRY_SERIALIZER);\r
+    RAFList.write(raf, sources, RAFSerializer.STRING);\r
+    RAFList.write(raf, entries, ENTRY_SERIALIZER);\r
     languageDatas[0].write(raf);\r
     languageDatas[1].write(raf);\r
     raf.writeUTF(VERSION_CODE);\r
@@ -82,16 +82,16 @@ public final class Dictionary implements RAFSerializable<Dictionary> {
         throw new RuntimeException("Unknown language.");\r
       }\r
       this.lang = lang;\r
-      rows = CachingList.create(UniformFileList.create(raf, ROW_SERIALIZER, raf\r
+      rows = CachingList.create(UniformRAFList.create(raf, ROW_SERIALIZER, raf\r
           .getFilePointer()), 10000);\r
-      sortedIndex = CachingList.create(FileList.create(raf,\r
+      sortedIndex = CachingList.create(RAFList.create(raf,\r
           INDEX_ENTRY_SERIALIZER, raf.getFilePointer()), 10000);\r
     }\r
 \r
     public void write(final RandomAccessFile raf) throws IOException {\r
       raf.writeUTF(language.symbol);\r
-      UniformFileList.write(raf, rows, ROW_SERIALIZER, 4);\r
-      FileList.write(raf, sortedIndex, INDEX_ENTRY_SERIALIZER);\r
+      UniformRAFList.write(raf, rows, ROW_SERIALIZER, 4);\r
+      RAFList.write(raf, sortedIndex, INDEX_ENTRY_SERIALIZER);\r
     }\r
 \r
     String rowToString(final Row row, final boolean onlyFirstSubentry) {\r