From 50e3589564c609cd41c430aa10b45dc9db06623b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Sun, 5 Jun 2016 14:38:53 +0200
Subject: [PATCH] Fix trailing whitespace and DOS linebreaks.

---
 res/drawable/theme_default_normal_row_bg.xml  |   6 +-
 .../theme_default_token_row_main_bg.xml       |   6 +-
 .../theme_default_token_row_other_bg.xml      |   6 +-
 res/drawable/theme_light_normal_row_bg.xml    |   6 +-
 .../theme_light_token_row_main_bg.xml         |   6 +-
 .../theme_light_token_row_other_bg.xml        |   6 +-
 res/layout/about_activity.xml                 |   2 +-
 res/layout/about_dictionary_dialog.xml        |   8 +-
 res/layout/dictionary_activity.xml            |   8 +-
 res/layout/dictionary_manager_row.xml         |   4 +-
 res/layout/html_display_activity.xml          |   4 +-
 res/layout/select_dictionary_dialog.xml       |  10 +-
 res/values-de/arrays.xml                      |   2 +-
 res/values-de/strings.xml                     |   4 +-
 res/values-es/arrays.xml                      |   2 +-
 res/values-es/strings.xml                     |   2 +-
 res/values-it/strings.xml                     |  12 +-
 res/values-ja/arrays.xml                      |   2 +-
 res/values-v11/styles.xml                     |   4 +-
 res/values-v14/styles.xml                     |   2 +-
 res/values/arrays.xml                         |   2 +-
 .../android/dictionary/AboutActivity.java     |  94 +++---
 .../dictionary/DictionaryActivity.java        |   6 +-
 .../dictionary/DictionaryApplication.java     |   2 +-
 .../dictionary/DictionaryManagerActivity.java |   4 +-
 .../dictionary/HtmlDisplayActivity.java       | 274 +++++++++---------
 .../dictionary/PreferenceActivity.java        |   2 +-
 .../android/dictionary/engine/Index.java      |   2 +-
 .../android/dictionary/engine/Language.java   | 254 ++++++++--------
 29 files changed, 371 insertions(+), 371 deletions(-)

diff --git a/res/drawable/theme_default_normal_row_bg.xml b/res/drawable/theme_default_normal_row_bg.xml
index ee37a0c..11e22e6 100644
--- a/res/drawable/theme_default_normal_row_bg.xml
+++ b/res/drawable/theme_default_normal_row_bg.xml
@@ -1,4 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_selected="true" android:drawable="@android:color/transparent" /> 
-  <item android:drawable="@color/theme_default_normal_row_bg" /> 
-</selector>
\ No newline at end of file
+  <item android:state_selected="true" android:drawable="@android:color/transparent" />
+  <item android:drawable="@color/theme_default_normal_row_bg" />
+</selector>
diff --git a/res/drawable/theme_default_token_row_main_bg.xml b/res/drawable/theme_default_token_row_main_bg.xml
index aa03ef6..62c7c6b 100644
--- a/res/drawable/theme_default_token_row_main_bg.xml
+++ b/res/drawable/theme_default_token_row_main_bg.xml
@@ -1,4 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_selected="true" android:drawable="@android:color/transparent" /> 
-  <item android:drawable="@color/theme_default_token_row_main_bg" /> 
-</selector>
\ No newline at end of file
+  <item android:state_selected="true" android:drawable="@android:color/transparent" />
+  <item android:drawable="@color/theme_default_token_row_main_bg" />
+</selector>
diff --git a/res/drawable/theme_default_token_row_other_bg.xml b/res/drawable/theme_default_token_row_other_bg.xml
index 4bdbce1..2b3c0eb 100644
--- a/res/drawable/theme_default_token_row_other_bg.xml
+++ b/res/drawable/theme_default_token_row_other_bg.xml
@@ -1,4 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_selected="true" android:drawable="@android:color/transparent" /> 
-  <item android:drawable="@color/theme_default_token_row_other_bg" /> 
-</selector>
\ No newline at end of file
+  <item android:state_selected="true" android:drawable="@android:color/transparent" />
+  <item android:drawable="@color/theme_default_token_row_other_bg" />
+</selector>
diff --git a/res/drawable/theme_light_normal_row_bg.xml b/res/drawable/theme_light_normal_row_bg.xml
index 95e9963..0894385 100644
--- a/res/drawable/theme_light_normal_row_bg.xml
+++ b/res/drawable/theme_light_normal_row_bg.xml
@@ -1,4 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_selected="true" android:drawable="@android:color/transparent" /> 
-  <item android:drawable="@color/theme_light_normal_row_bg" /> 
-</selector>
\ No newline at end of file
+  <item android:state_selected="true" android:drawable="@android:color/transparent" />
+  <item android:drawable="@color/theme_light_normal_row_bg" />
+</selector>
diff --git a/res/drawable/theme_light_token_row_main_bg.xml b/res/drawable/theme_light_token_row_main_bg.xml
index 3125908..4d1a2a1 100644
--- a/res/drawable/theme_light_token_row_main_bg.xml
+++ b/res/drawable/theme_light_token_row_main_bg.xml
@@ -1,4 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_selected="true" android:drawable="@android:color/transparent" /> 
-  <item android:drawable="@color/theme_light_token_row_main_bg" /> 
-</selector>
\ No newline at end of file
+  <item android:state_selected="true" android:drawable="@android:color/transparent" />
+  <item android:drawable="@color/theme_light_token_row_main_bg" />
+</selector>
diff --git a/res/drawable/theme_light_token_row_other_bg.xml b/res/drawable/theme_light_token_row_other_bg.xml
index 7e74c1d..3271df2 100644
--- a/res/drawable/theme_light_token_row_other_bg.xml
+++ b/res/drawable/theme_light_token_row_other_bg.xml
@@ -1,4 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_selected="true" android:drawable="@android:color/transparent" /> 
-  <item android:drawable="@color/theme_light_token_row_other_bg" /> 
-</selector>
\ No newline at end of file
+  <item android:state_selected="true" android:drawable="@android:color/transparent" />
+  <item android:drawable="@color/theme_light_token_row_other_bg" />
+</selector>
diff --git a/res/layout/about_activity.xml b/res/layout/about_activity.xml
index aeec432..b3ba12c 100644
--- a/res/layout/about_activity.xml
+++ b/res/layout/about_activity.xml
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:text="@string/contactMe"
             android:textAppearance="?android:attr/textAppearanceSmall" />
-        
+
         <TextView
             android:id="@+id/email"
             android:layout_width="wrap_content"
diff --git a/res/layout/about_dictionary_dialog.xml b/res/layout/about_dictionary_dialog.xml
index d143340..731d493 100644
--- a/res/layout/about_dictionary_dialog.xml
+++ b/res/layout/about_dictionary_dialog.xml
@@ -1,11 +1,11 @@
 <ScrollView android:id="@+id/ScrollView01"
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent" 
+  android:layout_width="fill_parent"
   android:layout_height="fill_parent">
-  
-  <TextView 
+
+  <TextView
     android:id="@+id/text"
-    android:layout_width="wrap_content" 
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"/>
 
diff --git a/res/layout/dictionary_activity.xml b/res/layout/dictionary_activity.xml
index 3aefc7f..76f3a01 100644
--- a/res/layout/dictionary_activity.xml
+++ b/res/layout/dictionary_activity.xml
@@ -4,8 +4,8 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <!-- 
-    
+    <!--
+
     <LinearLayout
         android:id="@+id/SearchBarLinearLayout"
         android:layout_width="fill_parent"
@@ -38,7 +38,7 @@
     </LinearLayout>
 
  -->
- 
+
     <ListView
         android:id="@id/android:list"
         android:layout_width="fill_parent"
@@ -55,4 +55,4 @@
         android:layout_height="match_parent"
         android:text="@string/noSearchResults" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/dictionary_manager_row.xml b/res/layout/dictionary_manager_row.xml
index 365e1f4..eeaf5ed 100644
--- a/res/layout/dictionary_manager_row.xml
+++ b/res/layout/dictionary_manager_row.xml
@@ -19,7 +19,7 @@
         </LinearLayout>
 
         <!--
-        http://stackoverflow.com/questions/11243867/android-last-line-of-textview-cut-off 
+        http://stackoverflow.com/questions/11243867/android-last-line-of-textview-cut-off
          -->
         <TextView
             android:id="@+id/dictionaryName"
@@ -49,4 +49,4 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         tools:ignore="HardcodedText" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/html_display_activity.xml b/res/layout/html_display_activity.xml
index 0e22626..a47c7d4 100644
--- a/res/layout/html_display_activity.xml
+++ b/res/layout/html_display_activity.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-    
+
   <com.hughes.android.dictionary.MyWebView
       android:id="@+id/webView"
       android:layout_width="match_parent"
@@ -16,4 +16,4 @@
       android:layout_height="wrap_content"
       android:text="@android:string/ok" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/select_dictionary_dialog.xml b/res/layout/select_dictionary_dialog.xml
index 54fe608..b73deb8 100644
--- a/res/layout/select_dictionary_dialog.xml
+++ b/res/layout/select_dictionary_dialog.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout 
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 
-	<ListView 
-		android:id="@id/android:list" 
+	<ListView
+		android:id="@id/android:list"
 		android:layout_width="fill_parent"
-		android:layout_height="0dip" 
+		android:layout_height="0dip"
 		android:choiceMode="singleChoice"
-		android:clickable="true" 
+		android:clickable="true"
 		android:focusable="true"
     android:layout_weight="1.0"
     />
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 9709e0f..63409ea 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -13,5 +13,5 @@
     <item>Weiß-Theme</item>
     <item>Standard-Theme</item>
   </string-array>
-  
+
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 88971b2..193d82d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -44,7 +44,7 @@
     <string name="nextWord">Nächstes Wort</string>
     <string name="previousWord">Voriges Wort</string>
     <string name="randomWord">Zufälliges Wort</string>
-    
+
     <!-- About dictionary. -->
     <string name="dictionaryPath">Datei: %s</string>
     <string name="dictionarySize">Größe: %,d bytes</string>
@@ -84,5 +84,5 @@
     <string name="themeTitle">Farbschema</string>
     <string name="themeSummary">Auswahl des Farbschemas für das Wörterbuch und die Menüs.</string>
     <string name="chosenNotWritable">Chosen directory not writable, try one of</string>
-   
+
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 309a59c..1201722 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -13,5 +13,5 @@
     <item>Tema luminoso</item>
     <item>Tema predeterminado</item>
   </string-array>
-  
+
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 70ba292..93ca703 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -24,7 +24,7 @@
 
     <!-- Download. -->
     <string name="downloadFailed">Error descargando archivo: \n%s</string>
-    <string name="downloadManagerQueryFailed">No se pudo consultar con el gestor de descargas.\nEstá deshabilitado o no se encuentra</string>   
+    <string name="downloadManagerQueryFailed">No se pudo consultar con el gestor de descargas.\nEstá deshabilitado o no se encuentra</string>
     <string name="unzippingDictionary">Descomprimiendo diccionario: \n%s</string>
     <string name="unzippingFailed">Error descomprimiendo diccionario: \n%s</string>
     <string name="installationFinished">Terminado: \n%s.</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 83408d5..571d344 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -7,7 +7,7 @@
     <string name="help">Guida</string>
     <string name="reportIssue">Segnala problema…</string>
     <string name="no_dict_file">Please specify a default directory in the settings.</string>
-    
+
     <!-- DictionaryManagerActivity -->
     <string name="dictionaryManager">Gestione dizionari</string>
     <string name="dictionariesOnDevice">Dizionari sul dispositivo</string>
@@ -43,7 +43,7 @@
     <string name="speak">Pronuncia</string>
     <string name="nextWord">Next word</string>
     <string name="previousWord">Previous word</string>
-    
+
     <!-- About dictionary. -->
     <string name="dictionaryPath">File: %s</string>
     <string name="dictionarySize">Dimenzione: %,d bytes</string>
@@ -55,10 +55,10 @@
 
     <!-- About. -->
     <string name="contactMe">Grazie a Fabio per la traduzione in italiano!
-Se stai usando QuickDic, mi piacerebbe saperlo. 
-Sfortunatamente, non ho responsabilità circa il contenuto del dizionario 
-(al difuori della formattazione), in quanto è creato con altre sorgenti. 
-Per favore inviami (in inglese) commenti, suggerimenti, 
+Se stai usando QuickDic, mi piacerebbe saperlo.
+Sfortunatamente, non ho responsabilità circa il contenuto del dizionario
+(al difuori della formattazione), in quanto è creato con altre sorgenti.
+Per favore inviami (in inglese) commenti, suggerimenti,
 segnalazioni di bug o semplicemente un breve saluto a:</string>
     <string name="webPage">Per più informazioni, guarda:</string>
     <string name="contributionsFrom">Contributions from:</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index d747704..139a9eb 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -13,5 +13,5 @@
     <item>ライト テーマ</item>
     <item>デフォルト テーマ</item>
   </string-array>
-  
+
 </resources>
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
index dae0c37..45064cd 100644
--- a/res/values-v11/styles.xml
+++ b/res/values-v11/styles.xml
@@ -1,5 +1,5 @@
 <resources>
-    
+
     <style name="AppBaseThemeLight" parent="@style/Theme.AppCompat.Light">
         <!--
             Theme customizations available in newer API levels can go in
@@ -7,7 +7,7 @@
             backward-compatibility can go here.
         -->
     </style>
-    
+
     <style name="AppBaseThemeDark" parent="@style/Theme.AppCompat">
         <!--
             Theme customizations available in newer API levels can go in
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index 94fd7e0..f11f745 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -1,3 +1,3 @@
 <resources>
-    
+
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 732313b..276f9a0 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -26,5 +26,5 @@
     <item>Light theme</item>
     <item>Default theme</item>
   </string-array>
-  
+
 </resources>
diff --git a/src/com/hughes/android/dictionary/AboutActivity.java b/src/com/hughes/android/dictionary/AboutActivity.java
index 1f9a1a2..7afcc0c 100644
--- a/src/com/hughes/android/dictionary/AboutActivity.java
+++ b/src/com/hughes/android/dictionary/AboutActivity.java
@@ -1,47 +1,47 @@
-// 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 android.app.Activity;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.widget.TextView;
-
-public final class AboutActivity extends Activity {
-
-    public static final String CURRENT_DICT_INFO = "currentDictInfo";
-
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
-
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.about_activity);
-        String ver = "???";
-        try {
-            PackageManager pm = getPackageManager();
-            if (pm != null) {
-                PackageInfo p = pm.getPackageInfo(getPackageName(), 0);
-                ver = p.versionName + " (ID " + p.versionCode + ")";
-            }
-        } catch (Exception e) {
-        }
-        TextView titleView = (TextView)findViewById(R.id.titleText);
-        titleView.setText("QuickDic " + ver);
-    }
-
-}
+// 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 android.app.Activity;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public final class AboutActivity extends Activity {
+
+    public static final String CURRENT_DICT_INFO = "currentDictInfo";
+
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(final Bundle savedInstanceState) {
+        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.about_activity);
+        String ver = "???";
+        try {
+            PackageManager pm = getPackageManager();
+            if (pm != null) {
+                PackageInfo p = pm.getPackageInfo(getPackageName(), 0);
+                ver = p.versionName + " (ID " + p.versionCode + ")";
+            }
+        } catch (Exception e) {
+        }
+        TextView titleView = (TextView)findViewById(R.id.titleText);
+        titleView.setText("QuickDic " + ver);
+    }
+
+}
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 6f7eeb0..c79faf3 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -473,9 +473,9 @@ public class DictionaryActivity extends ActionBarActivity {
         actionBar.setDisplayShowTitleEnabled(false);
         actionBar.setDisplayShowHomeEnabled(false);
         actionBar.setDisplayHomeAsUpEnabled(false);
-        
+
         final LinearLayout customSearchView = new LinearLayout(getSupportActionBar().getThemedContext());
-        
+
         final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         customSearchView.setLayoutParams(layoutParams);
@@ -1459,7 +1459,7 @@ public class DictionaryActivity extends ActionBarActivity {
             result.setFocusable(true);
             result.setLongClickable(true);
 //            result.setBackgroundResource(android.R.drawable.menuitem_background);
-            
+
             result.setBackgroundResource(theme.normalRowBg);
 
             result.setOnClickListener(new TextView.OnClickListener() {
diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 50acb43..e15dfff 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -283,7 +283,7 @@ public class DictionaryApplication extends Application {
         final List<String> dictionaryFilesOrdered = new ArrayList<String>();
 
         final Map<String, DictionaryInfo> uncompressedFilenameToDictionaryInfo = new LinkedHashMap<String, DictionaryInfo>();
-        
+
         /**
          * Sometimes a deserialized version of this data structure isn't valid.
          * @return
diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 5087104..a1bc375 100644
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -171,8 +171,8 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                 Log.w(LOG, "Download finished: " + dest + " Id: " + downloadId);
                 Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
                         Toast.LENGTH_LONG).show();
-                
-                
+
+
                 final Uri zipUri = Uri.parse(dest);
                 File localZipFile = null;
                 InputStream zipFileStream = null;
diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index bf8eda2..de3c138 100644
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -1,137 +1,137 @@
-// 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 android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
-import android.util.Base64;
-import android.util.Log;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-import com.hughes.util.StringUtil;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-public final class HtmlDisplayActivity extends ActionBarActivity {
-
-    static final String LOG = "QuickDic";
-
-    static final String HTML_RES = "html_res";
-    static final String HTML = "html";
-    static final String TEXT_TO_HIGHLIGHT = "textToHighlight";
-    static final String SHOW_OK_BUTTON = "showOKButton";
-
-    public static Intent getHelpLaunchIntent(Context c) {
-        final Intent intent = new Intent(c, HtmlDisplayActivity.class);
-        intent.putExtra(HTML_RES, R.raw.help);
-        return intent;
-    }
-
-    public static Intent getWhatsNewLaunchIntent(Context c) {
-        final Intent intent = new Intent(c, HtmlDisplayActivity.class);
-        intent.putExtra(HTML_RES, R.raw.whats_new);
-        return intent;
-    }
-
-    public static Intent getHtmlIntent(Context c, final String html, final String textToHighlight,
-            final boolean showOkButton) {
-        final Intent intent = new Intent(c, HtmlDisplayActivity.class);
-        intent.putExtra(HTML, html);
-        intent.putExtra(TEXT_TO_HIGHLIGHT, textToHighlight);
-        intent.putExtra(SHOW_OK_BUTTON, showOkButton);
-        return intent;
-    }
-
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
-
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.html_display_activity);
-        
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-
-        final int htmlRes = getIntent().getIntExtra(HTML_RES, -1);
-        String html;
-        if (htmlRes != -1) {
-            InputStream res = getResources().openRawResource(htmlRes);
-            html = StringUtil.readToString(res);
-            try {
-                res.close();
-            } catch (IOException e) {
-            }
-        } else {
-            html = getIntent().getStringExtra(HTML);
-        }
-        final MyWebView webView = (MyWebView) findViewById(R.id.webView);
-        try {
-            // No way to get pure UTF-8 data into WebView
-            html = Base64.encodeToString(html.getBytes("UTF-8"), Base64.DEFAULT);
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("Missing UTF-8 support?!", e);
-        }
-        // Use loadURL to allow specifying a charset
-        webView.loadUrl("data:text/html;charset=utf-8;base64," + html);
-        webView.activity = this;
-
-        final String textToHighlight = getIntent().getStringExtra(TEXT_TO_HIGHLIGHT);
-        if (textToHighlight != null && !"".equals(textToHighlight)) {
-            Log.d(LOG, "NOT Highlighting text: " + textToHighlight);
-            // This isn't working:
-            // webView.findAll(textToHighlight);
-            // webView.showFindDialog(textToHighlight, false);
-        }
-
-        final Button okButton = (Button) findViewById(R.id.okButton);
-        okButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-        if (!getIntent().getBooleanExtra(SHOW_OK_BUTTON, true)) {
-            okButton.setVisibility(Button.GONE);
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        final MyWebView webView = (MyWebView)findViewById(R.id.webView);
-        if (webView.canGoBack()) webView.goBack();
-        else super.onBackPressed();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Explicitly handle the up button press so
-        // we return to the dictionary.
-        if (item.getItemId() == android.R.id.home)
-        {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}
+// 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 android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.util.Base64;
+import android.util.Log;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+import com.hughes.util.StringUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+public final class HtmlDisplayActivity extends ActionBarActivity {
+
+    static final String LOG = "QuickDic";
+
+    static final String HTML_RES = "html_res";
+    static final String HTML = "html";
+    static final String TEXT_TO_HIGHLIGHT = "textToHighlight";
+    static final String SHOW_OK_BUTTON = "showOKButton";
+
+    public static Intent getHelpLaunchIntent(Context c) {
+        final Intent intent = new Intent(c, HtmlDisplayActivity.class);
+        intent.putExtra(HTML_RES, R.raw.help);
+        return intent;
+    }
+
+    public static Intent getWhatsNewLaunchIntent(Context c) {
+        final Intent intent = new Intent(c, HtmlDisplayActivity.class);
+        intent.putExtra(HTML_RES, R.raw.whats_new);
+        return intent;
+    }
+
+    public static Intent getHtmlIntent(Context c, final String html, final String textToHighlight,
+            final boolean showOkButton) {
+        final Intent intent = new Intent(c, HtmlDisplayActivity.class);
+        intent.putExtra(HTML, html);
+        intent.putExtra(TEXT_TO_HIGHLIGHT, textToHighlight);
+        intent.putExtra(SHOW_OK_BUTTON, showOkButton);
+        return intent;
+    }
+
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(final Bundle savedInstanceState) {
+        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.html_display_activity);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+
+        final int htmlRes = getIntent().getIntExtra(HTML_RES, -1);
+        String html;
+        if (htmlRes != -1) {
+            InputStream res = getResources().openRawResource(htmlRes);
+            html = StringUtil.readToString(res);
+            try {
+                res.close();
+            } catch (IOException e) {
+            }
+        } else {
+            html = getIntent().getStringExtra(HTML);
+        }
+        final MyWebView webView = (MyWebView) findViewById(R.id.webView);
+        try {
+            // No way to get pure UTF-8 data into WebView
+            html = Base64.encodeToString(html.getBytes("UTF-8"), Base64.DEFAULT);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("Missing UTF-8 support?!", e);
+        }
+        // Use loadURL to allow specifying a charset
+        webView.loadUrl("data:text/html;charset=utf-8;base64," + html);
+        webView.activity = this;
+
+        final String textToHighlight = getIntent().getStringExtra(TEXT_TO_HIGHLIGHT);
+        if (textToHighlight != null && !"".equals(textToHighlight)) {
+            Log.d(LOG, "NOT Highlighting text: " + textToHighlight);
+            // This isn't working:
+            // webView.findAll(textToHighlight);
+            // webView.showFindDialog(textToHighlight, false);
+        }
+
+        final Button okButton = (Button) findViewById(R.id.okButton);
+        okButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        if (!getIntent().getBooleanExtra(SHOW_OK_BUTTON, true)) {
+            okButton.setVisibility(Button.GONE);
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        final MyWebView webView = (MyWebView)findViewById(R.id.webView);
+        if (webView.canGoBack()) webView.goBack();
+        else super.onBackPressed();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Explicitly handle the up button press so
+        // we return to the dictionary.
+        if (item.getItemId() == android.R.id.home)
+        {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
index bcca16a..1e7ba15 100644
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -35,7 +35,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
     public void onCreate(Bundle savedInstanceState) {
         final DictionaryApplication application = (DictionaryApplication) getApplication();
         setTheme(application.getSelectedTheme().themeId);
-        
+
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         if (prefs.getString(getString(R.string.quickdicDirectoryKey), "").equals("")) {
             prefs.edit().putString(getString(R.string.quickdicDirectoryKey), application.getDictDir().getAbsolutePath()).commit();
diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index 5ee2ce9..01cd125 100644
--- a/src/com/hughes/android/dictionary/engine/Index.java
+++ b/src/com/hughes/android/dictionary/engine/Index.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * 
+ *
  */
 
 package com.hughes.android.dictionary.engine;
diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index 0d48fc3..007ad4b 100644
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -1,127 +1,127 @@
-// 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.engine;
-
-import com.hughes.android.dictionary.DictionaryApplication;
-import java.text.Collator;
-
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-public class Language {
-
-    public static final class LanguageResources {
-        public final String englishName;
-        public final int nameId;
-        public final int flagId;
-
-        public LanguageResources(final String englishName, int nameId, int flagId) {
-            this.englishName = englishName;
-            this.nameId = nameId;
-            this.flagId = flagId;
-        }
-
-        public LanguageResources(final String englishName, int nameId) {
-            this(englishName, nameId, 0);
-        }
-    }
-
-    private static final Map<String, Language> registry = new LinkedHashMap<String, Language>();
-
-    final String isoCode;
-    final Locale locale;
-
-    private Collator collator;
-
-    private Language(final Locale locale, final String isoCode) {
-        this.locale = locale;
-        this.isoCode = isoCode;
-
-        registry.put(isoCode.toLowerCase(), this);
-    }
-
-    @Override
-    public String toString() {
-        return locale.toString();
-    }
-
-    public String getIsoCode() {
-        return isoCode;
-    }
-
-    public synchronized Comparator getCollator() {
-        if (!DictionaryApplication.USE_COLLATOR)
-            return String.CASE_INSENSITIVE_ORDER;
-        // Don't think this is thread-safe...
-        // if (collator == null) {
-        this.collator = Collator.getInstance(locale);
-        this.collator.setStrength(Collator.IDENTICAL);
-        // }
-        return collator;
-    }
-
-    public String getDefaultNormalizerRules() {
-        return ":: Any-Latin; ' ' > ; :: Lower; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC ;";
-    }
-
-    /**
-     * A practical pattern to identify strong RTL characters. This pattern is
-     * not completely correct according to the Unicode standard. It is
-     * simplified for performance and small code size.
-     */
-    private static final String rtlChars =
-            "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
-
-    private static final String puncChars =
-            "\\[\\]\\(\\)\\{\\}\\=";
-
-    private static final Pattern RTL_LEFT_BOUNDARY = Pattern.compile("([" + puncChars + "])(["
-            + rtlChars + "])");
-    private static final Pattern RTL_RIGHT_BOUNDARY = Pattern.compile("([" + rtlChars + "])(["
-            + puncChars + "])");
-
-    public static String fixBidiText(String text) {
-        // text = RTL_LEFT_BOUNDARY.matcher(text).replaceAll("$1\u200e $2");
-        // text = RTL_RIGHT_BOUNDARY.matcher(text).replaceAll("$1 \u200e$2");
-        return text;
-    }
-
-    // ----------------------------------------------------------------
-
-    public static final Language en = new Language(Locale.ENGLISH, "EN");
-    public static final Language fr = new Language(Locale.FRENCH, "FR");
-    public static final Language it = new Language(Locale.ITALIAN, "IT");
-
-    public static final Language de = new Language(Locale.GERMAN, "DE") {
-        @Override
-        public String getDefaultNormalizerRules() {
-            return ":: Lower; 'ae' > 'ä'; 'oe' > 'ö'; 'ue' > 'ü'; 'ß' > 'ss'; ";
-        }
-    };
-
-    // ----------------------------------------------------------------
-
-    public static synchronized Language lookup(final String isoCode) {
-        Language lang = registry.get(isoCode.toLowerCase());
-        if (lang == null) {
-            lang = new Language(new Locale(isoCode), isoCode);
-        }
-        return lang;
-    }
-
-}
+// 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.engine;
+
+import com.hughes.android.dictionary.DictionaryApplication;
+import java.text.Collator;
+
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class Language {
+
+    public static final class LanguageResources {
+        public final String englishName;
+        public final int nameId;
+        public final int flagId;
+
+        public LanguageResources(final String englishName, int nameId, int flagId) {
+            this.englishName = englishName;
+            this.nameId = nameId;
+            this.flagId = flagId;
+        }
+
+        public LanguageResources(final String englishName, int nameId) {
+            this(englishName, nameId, 0);
+        }
+    }
+
+    private static final Map<String, Language> registry = new LinkedHashMap<String, Language>();
+
+    final String isoCode;
+    final Locale locale;
+
+    private Collator collator;
+
+    private Language(final Locale locale, final String isoCode) {
+        this.locale = locale;
+        this.isoCode = isoCode;
+
+        registry.put(isoCode.toLowerCase(), this);
+    }
+
+    @Override
+    public String toString() {
+        return locale.toString();
+    }
+
+    public String getIsoCode() {
+        return isoCode;
+    }
+
+    public synchronized Comparator getCollator() {
+        if (!DictionaryApplication.USE_COLLATOR)
+            return String.CASE_INSENSITIVE_ORDER;
+        // Don't think this is thread-safe...
+        // if (collator == null) {
+        this.collator = Collator.getInstance(locale);
+        this.collator.setStrength(Collator.IDENTICAL);
+        // }
+        return collator;
+    }
+
+    public String getDefaultNormalizerRules() {
+        return ":: Any-Latin; ' ' > ; :: Lower; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC ;";
+    }
+
+    /**
+     * A practical pattern to identify strong RTL characters. This pattern is
+     * not completely correct according to the Unicode standard. It is
+     * simplified for performance and small code size.
+     */
+    private static final String rtlChars =
+            "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
+
+    private static final String puncChars =
+            "\\[\\]\\(\\)\\{\\}\\=";
+
+    private static final Pattern RTL_LEFT_BOUNDARY = Pattern.compile("([" + puncChars + "])(["
+            + rtlChars + "])");
+    private static final Pattern RTL_RIGHT_BOUNDARY = Pattern.compile("([" + rtlChars + "])(["
+            + puncChars + "])");
+
+    public static String fixBidiText(String text) {
+        // text = RTL_LEFT_BOUNDARY.matcher(text).replaceAll("$1\u200e $2");
+        // text = RTL_RIGHT_BOUNDARY.matcher(text).replaceAll("$1 \u200e$2");
+        return text;
+    }
+
+    // ----------------------------------------------------------------
+
+    public static final Language en = new Language(Locale.ENGLISH, "EN");
+    public static final Language fr = new Language(Locale.FRENCH, "FR");
+    public static final Language it = new Language(Locale.ITALIAN, "IT");
+
+    public static final Language de = new Language(Locale.GERMAN, "DE") {
+        @Override
+        public String getDefaultNormalizerRules() {
+            return ":: Lower; 'ae' > 'ä'; 'oe' > 'ö'; 'ue' > 'ü'; 'ß' > 'ss'; ";
+        }
+    };
+
+    // ----------------------------------------------------------------
+
+    public static synchronized Language lookup(final String isoCode) {
+        Language lang = registry.get(isoCode.toLowerCase());
+        if (lang == null) {
+            lang = new Language(new Locale(isoCode), isoCode);
+        }
+        return lang;
+    }
+
+}
-- 
2.43.0