Fix IDE warnings and make some methods static

Julien LepillerSat Jun 06 19:33:58+0200 2020

7f932b9

Fix IDE warnings and make some methods static

.idea/dictionaries/tyreunom.xml

22
  <dictionary name="tyreunom">
33
    <words>
44
      <w>kanji</w>
5+
      <w>kanjis</w>
6+
      <w>mozc</w>
57
    </words>
68
  </dictionary>
79
</component>
79=
810=
\ No newline at end of file

app/src/main/java/eu/lepiller/nani/DictionaryActivity.java

11
package eu.lepiller.nani;
22
33
import android.content.Intent;
4-
import android.graphics.drawable.Drawable;
54
import android.os.AsyncTask;
65
import android.os.Bundle;
76
import androidx.appcompat.app.AppCompatActivity;
8-
import androidx.appcompat.widget.Toolbar;
97
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
108
119
import android.util.Log;

2321
import java.net.MalformedURLException;
2422
import java.net.URL;
2523
import java.util.ArrayList;
26-
import java.util.HashMap;
2724
2825
import eu.lepiller.nani.dictionary.DictionariesAdapter;
2926
import eu.lepiller.nani.dictionary.DictionaryFactory;

app/src/main/java/eu/lepiller/nani/RadicalSelectorView.java

2929
3030
public class RadicalSelectorView extends LinearLayout implements OnTaskCompleted<Map<Integer, List<String>>>,
3131
        OnOtherTaskCompleted<Pair<Map<Integer, List<String>>, Set<String>>> {
32-
    static private String TAG = "RSV";
32+
    static private final String TAG = "RSV";
3333
    private Button close_button;
3434
    private LinearLayout kanji_row1, kanji_row2;
3535
    private LinearLayout radical_table;

app/src/main/java/eu/lepiller/nani/dictionary/Dictionary.java

3131
    private File file, temporaryFile;
3232
3333
    private static Drawable drawable=null, newDrawable=null;
34-
    private static final String TAG = "DICO";
3534
3635
    Dictionary(String n, String descr, String fullDescr, File cacheDir, int fileSize, int entries, String hash) {
3736
        name = n;

9291
        return drawable;
9392
    }
9493
95-
    private Bitmap drawableToBitmap(Drawable drawable) {
94+
    private static Bitmap drawableToBitmap(Drawable drawable) {
9695
        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(),
9796
                Bitmap.Config.ARGB_8888);
9897
        Canvas canvas = new Canvas(bitmap);

101100
        return bitmap;
102101
    }
103102
104-
    private Bitmap drawableToBitmap(Drawable drawable, int width, int height) {
103+
    private static Bitmap drawableToBitmap(Drawable drawable, int width, int height) {
105104
        Bitmap background = drawableToBitmap(drawable);
106105
        return Bitmap.createScaledBitmap(background, width, height, false);
107106
    }

app/src/main/java/eu/lepiller/nani/dictionary/FileDictionary.java

1212
import java.util.Map;
1313
1414
public abstract class FileDictionary extends Dictionary {
15-
    String encoding = "UTF-8";
15+
    static final String encoding = "UTF-8";
1616
1717
    interface Huffman {
1818
    }

136136
            return 0;
137137
    }
138138
139-
    String getString(RandomAccessFile file) throws IOException {
139+
    static String getString(RandomAccessFile file) throws IOException {
140140
        byte b;
141141
        ArrayList<Byte> bs = new ArrayList<>();
142142
        while((b = file.readByte()) != 0) {

149149
        return new String(str, encoding);
150150
    }
151151
152-
    ArrayList<String> getStringList(RandomAccessFile file) throws IOException {
152+
    static ArrayList<String> getStringList(RandomAccessFile file) throws IOException {
153153
        ArrayList<String> results = new ArrayList<>();
154154
        int number = file.readShort();
155155
        for(int i=0; i<number; i++) {

158158
        return results;
159159
    }
160160
161-
    ArrayList<Integer> getIntList(RandomAccessFile file) throws IOException {
161+
    static ArrayList<Integer> getIntList(RandomAccessFile file) throws IOException {
162162
        ArrayList<Integer> results = new ArrayList<>();
163163
        int number = file.readShort();
164164
        for(int i=0; i<number; i++) {

167167
        return results;
168168
    }
169169
170-
    Huffman loadHuffman(RandomAccessFile file) throws IOException {
170+
    static Huffman loadHuffman(RandomAccessFile file) throws IOException {
171171
        byte b = file.readByte();
172172
        if(b == 1) {
173173
            Huffman left = loadHuffman(file);

191191
        }
192192
    }
193193
194-
    private String getHuffmanString(RandomAccessFile file, Huffman huffman) throws IOException {
194+
    private static String getHuffmanString(RandomAccessFile file, Huffman huffman) throws IOException {
195195
        StringBuilder b = new StringBuilder();
196196
        ArrayList<Boolean> bits = new ArrayList<>();
197197
        String c = null;

221221
        return b.toString();
222222
    }
223223
224-
    void logHuffman(Huffman h, ArrayList<Boolean> addr) {
224+
    static void logHuffman(Huffman h, ArrayList<Boolean> addr) {
225225
        if (h instanceof JMDict.HuffmanValue) {
226226
            Log.d(TAG, "HUFF: " + ((JMDict.HuffmanValue) h).character + " -> " + addr.toString());
227227
        } else if(h instanceof JMDict.HuffmanTree) {

234234
        }
235235
    }
236236
237-
    ArrayList<String> getHuffmanStringList(RandomAccessFile file, Huffman huffman) throws IOException {
237+
    static ArrayList<String> getHuffmanStringList(RandomAccessFile file, Huffman huffman) throws IOException {
238238
        ArrayList<String> results = new ArrayList<>();
239239
        int number = file.readShort();
240240
        Log.d(TAG, "huffmanStrings: " + number);

app/src/main/java/eu/lepiller/nani/dictionary/RadicalDict.java

9999
        super(name, description, fullDescription, cacheDir, url, fileSize, entries, hash);
100100
    }
101101
102-
    private boolean contains(List<String> lst, String s) {
102+
    private static boolean contains(List<String> lst, String s) {
103103
        if(lst==null)
104104
            return false;
105105
        for(String p: lst) {