Fix compilation against latest newformat branch.

diff --git a/compile.sh b/compile.sh
index 492b629a5f4797b895740e014122bd187770d45b..638c7650f3823484f6b6d2d086b0ab0a953cb64e 100755 (executable)
--- a/compile.sh
+++ b/compile.sh
@@ -1 +1 @@
-javac ../Util/src/com/hughes/util/*.java ../Util/src/com/hughes/util/raf/*.java ../Dictionary/src/com/hughes/android/dictionary/DictionaryInfo.java ../Dictionary/src/com/hughes/android/dictionary/engine/*.java ../Dictionary/src/com/hughes/android/dictionary/C.java src/com/hughes/android/dictionary/*/*.java src/com/hughes/android/dictionary/*/*/*.java -classpath /usr/share/java/com.ibm.icu.jar:/usr/share/java/junit.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/commons-lang3.jar
+javac ../Util/src/com/hughes/util/*.java ../Util/src/com/hughes/util/raf/*.java ../Dictionary/src/com/hughes/android/dictionary/DictionaryInfo.java ../Dictionary/src/com/hughes/android/dictionary/engine/*.java ../Dictionary/src/com/hughes/android/dictionary/C.java src/com/hughes/android/dictionary/*.java src/com/hughes/android/dictionary/*/*.java src/com/hughes/android/dictionary/*/*/*.java -classpath /usr/share/java/com.ibm.icu.jar:/usr/share/java/junit.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/commons-lang3.jar

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
new file mode 100644 (file)
index 0000000..da5e67c
--- /dev/null
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -0,0 +1,5 @@
+package com.hughes.android.dictionary;
+
+final public class DictionaryApplication {
+    final static public boolean USE_COLLATOR = true;
+}

diff --git a/src/com/hughes/android/dictionary/SerializeCollatorTest.java b/src/com/hughes/android/dictionary/SerializeCollatorTest.java
index d22ce5ec5c84eb903e0d91dea201181232c14fc0..38922bb4c10228434d23a909c7d06d2be5efdcc8 100644 (file)
--- a/src/com/hughes/android/dictionary/SerializeCollatorTest.java
+++ b/src/com/hughes/android/dictionary/SerializeCollatorTest.java
@@ -16,6 +16,7 @@ package com.hughes.android.dictionary;
 \r
 import java.io.File;\r
 import java.io.IOException;\r
+import java.util.Comparator;\r
 \r
 import com.hughes.android.dictionary.engine.Language;\r
 import com.ibm.icu.text.Collator;\r
@@ -28,7 +29,7 @@ public class SerializeCollatorTest {
    */\r
   public static void main(String[] args) throws IOException {\r
     File temp = File.createTempFile("temp", null);\r
-    final Collator c = Language.de.getCollator();\r
+    final Comparator c = Language.de.getCollator();\r
     //FileUtil.writeObject(c, temp);\r
   }\r
 \r