From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Sat, 12 Dec 2015 15:11:36 +0000 (+0100)
Subject: Fix compilation against latest newformat branch.
X-Git-Url: http://gitweb.fperrin.net/?p=DictionaryPC.git;a=commitdiff_plain;h=575047a16fba83b34477ea89b6ef67dddc0721ac

Fix compilation against latest newformat branch.
---

diff --git a/compile.sh b/compile.sh
index 492b629..638c765 100755
--- 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
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 d22ce5e..38922bb 100644
--- 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;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Comparator;
 
 import com.hughes.android.dictionary.engine.Language;
 import com.ibm.icu.text.Collator;
@@ -28,7 +29,7 @@ public class SerializeCollatorTest {
    */
   public static void main(String[] args) throws IOException {
     File temp = File.createTempFile("temp", null);
-    final Collator c = Language.de.getCollator();
+    final Comparator c = Language.de.getCollator();
     //FileUtil.writeObject(c, temp);
   }