Consistent EOL format.

diff --git a/src/com/hughes/android/dictionary/DateFormatTest.java b/src/com/hughes/android/dictionary/DateFormatTest.java
index fce209525089d281b22dfd22822d85260e0b8aae..8be638c6c39d13bab42b03539c539835d2fe0200 100644 (file)
--- a/src/com/hughes/android/dictionary/DateFormatTest.java
+++ b/src/com/hughes/android/dictionary/DateFormatTest.java
@@ -1,29 +1,29 @@
-// Copyright 2011 Google Inc. All Rights Reserved.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-//     http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-\r
-package com.hughes.android.dictionary;\r
-\r
-import java.text.SimpleDateFormat;\r
-import java.util.Date;\r
-\r
-public class DateFormatTest {\r
-\r
-    /**\r
-     * @param args\r
-     */\r
-    public static void main(String[] args) {\r
-        System.out.println(new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(new Date()));\r
-    }\r
-\r
-}\r
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.hughes.android.dictionary;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateFormatTest {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        System.out.println(new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(new Date()));
+    }
+
+}

diff --git a/src/com/hughes/android/dictionary/SerializeCollatorTest.java b/src/com/hughes/android/dictionary/SerializeCollatorTest.java
index 66451ffbadac3d1d87f17c2ca3d6bd5e8b7647ee..2980e10b40304c0cb93c107d14a3d699fbbe4168 100644 (file)
--- a/src/com/hughes/android/dictionary/SerializeCollatorTest.java
+++ b/src/com/hughes/android/dictionary/SerializeCollatorTest.java
@@ -1,35 +1,35 @@
-// Copyright 2011 Google Inc. All Rights Reserved.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-//     http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-\r
-package com.hughes.android.dictionary;\r
-\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
-\r
-public class SerializeCollatorTest {\r
-\r
-    /**\r
-     * @param args\r
-     * @throws IOException\r
-     */\r
-    public static void main(String[] args) throws IOException {\r
-        File temp = File.createTempFile("temp", null);\r
-        final Comparator<Object> c = Language.de.getCollator();\r
-        //FileUtil.writeObject(c, temp);\r
-    }\r
-\r
-}\r
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.hughes.android.dictionary;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Comparator;
+
+import com.hughes.android.dictionary.engine.Language;
+
+public class SerializeCollatorTest {
+
+    /**
+     * @param args
+     * @throws IOException
+     */
+    public static void main(String[] args) throws IOException {
+        File temp = File.createTempFile("temp", null);
+        final Comparator<Object> c = Language.de.getCollator();
+        //FileUtil.writeObject(c, temp);
+    }
+
+}

diff --git a/src/com/hughes/util/FileUtil.java b/src/com/hughes/util/FileUtil.java
index d3024da18947d68cecf06930a3acaf7ae81efda1..d280cc1a232e8e2798b5e57e6e25ec0d59689b73 100644 (file)
--- a/src/com/hughes/util/FileUtil.java
+++ b/src/com/hughes/util/FileUtil.java
@@ -1,67 +1,67 @@
-// Copyright 2011 Google Inc. All Rights Reserved.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-//     http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-\r
-package com.hughes.util;\r
-\r
-import java.io.BufferedReader;\r
-import java.io.File;\r
-import java.io.FileInputStream;\r
-import java.io.FileOutputStream;\r
-import java.io.IOException;\r
-import java.io.InputStreamReader;\r
-import java.io.PrintStream;\r
-import java.io.RandomAccessFile;\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-@SuppressWarnings("WeakerAccess")\r
-public final class FileUtil {\r
-    public static String readLine(final RandomAccessFile file, final long startPos) throws IOException {\r
-        file.seek(startPos);\r
-        return file.readLine();\r
-    }\r
-\r
-    public static List<String> readLines(final File file) throws IOException {\r
-        final List<String> result = new ArrayList<>();\r
-        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) {\r
-            String line;\r
-            while ((line = in.readLine()) != null) {\r
-                result.add(line);\r
-            }\r
-        }\r
-        return result;\r
-    }\r
-\r
-    public static String readToString(final File file) throws IOException {\r
-        StringBuilder result = new StringBuilder();\r
-        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) {\r
-            String line;\r
-            while ((line = in.readLine()) != null) {\r
-                result.append(line).append("\n");\r
-            }\r
-        }\r
-        return result.toString();\r
-    }\r
-\r
-    public static void writeStringToUTF8File(final String string, final File file) {\r
-        throw new IllegalStateException();\r
-    }\r
-\r
-    public static void printString(final File file, final String s) throws IOException {\r
-        final PrintStream out = new PrintStream(new FileOutputStream(file));\r
-        out.print(s);\r
-        out.close();\r
-    }\r
-\r
-}\r
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.hughes.util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.List;
+
+@SuppressWarnings("WeakerAccess")
+public final class FileUtil {
+    public static String readLine(final RandomAccessFile file, final long startPos) throws IOException {
+        file.seek(startPos);
+        return file.readLine();
+    }
+
+    public static List<String> readLines(final File file) throws IOException {
+        final List<String> result = new ArrayList<>();
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) {
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.add(line);
+            }
+        }
+        return result;
+    }
+
+    public static String readToString(final File file) throws IOException {
+        StringBuilder result = new StringBuilder();
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) {
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line).append("\n");
+            }
+        }
+        return result.toString();
+    }
+
+    public static void writeStringToUTF8File(final String string, final File file) {
+        throw new IllegalStateException();
+    }
+
+    public static void printString(final File file, final String s) throws IOException {
+        final PrintStream out = new PrintStream(new FileOutputStream(file));
+        out.print(s);
+        out.close();
+    }
+
+}