Clean up order of imports.

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

diff --git a/src/com/hughes/android/dictionary/engine/EntrySource.java b/src/com/hughes/android/dictionary/engine/EntrySource.java
index 7991fdcf6fd605c02ae1e38ca2bdc36e006281a9..635724f05075c71f912a6d6f8fdf3c740037094a 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/EntrySource.java
+++ b/src/com/hughes/android/dictionary/engine/EntrySource.java
@@ -14,64 +14,60 @@
 
 package com.hughes.android.dictionary.engine;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import com.hughes.util.IndexedObject;
 import com.hughes.util.raf.RAFListSerializer;
 
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.io.Serializable;
-
-public class EntrySource extends IndexedObject implements Serializable {
-  
-  private static final long serialVersionUID = -1323165134846120269L;
-  
-  final String name;
-  int numEntries;
-  
-  public EntrySource(final int index, final String name, int numEntries) {
-    super(index);
-    this.name = name;
-    this.numEntries = numEntries;
-  }
-  
-  @Override
-  public String toString() {
-    return name;
-  }
-  
-  
+public class EntrySource extends IndexedObject {
 
+    final String name;
+    @SuppressWarnings("CanBeFinal")
+    int numEntries;
 
-  public int getNumEntries() {
-    return numEntries;
-  }
+    @SuppressWarnings("WeakerAccess")
+    public EntrySource(final int index, final String name, int numEntries) {
+        super(index);
+        this.name = name;
+        this.numEntries = numEntries;
+    }
 
-  public String getName() {
-    return name;
-  }
+    @Override
+    public String toString() {
+        return name;
+    }
 
+    public int getNumEntries() {
+        return numEntries;
+    }
 
-  public static final class Serializer implements RAFListSerializer<EntrySource> {
-    
-    final Dictionary dictionary;
-    
-    Serializer(Dictionary dictionary) {
-      this.dictionary = dictionary;
+    public String getName() {
+        return name;
     }
 
-    @Override
-    public EntrySource read(RandomAccessFile raf, int readIndex)
+    public static final class Serializer implements RAFListSerializer<EntrySource> {
+
+        final Dictionary dictionary;
+
+        Serializer(Dictionary dictionary) {
+            this.dictionary = dictionary;
+        }
+
+        @Override
+        public EntrySource read(DataInput raf, int readIndex)
         throws IOException {
-      final String name = raf.readUTF();
-      final int numEntries = dictionary.dictFileVersion >= 3 ? raf.readInt() : 0;
-      return new EntrySource(readIndex, name, numEntries);
+            final String name = raf.readUTF();
+            final int numEntries = dictionary.dictFileVersion >= 3 ? raf.readInt() : 0;
+            return new EntrySource(readIndex, name, numEntries);
+        }
+
+        @Override
+        public void write(DataOutput raf, EntrySource t) throws IOException {
+            raf.writeUTF(t.name);
+            raf.writeInt(t.numEntries);
+        }
     }
 
-    @Override
-    public void write(RandomAccessFile raf, EntrySource t) throws IOException {
-      raf.writeUTF(t.name);
-      raf.writeInt(t.numEntries);
-    }    
-  };
-  
 }