Skip to content
Snippets Groups Projects
Commit 0c8d5ca0 authored by Jean Chalard's avatar Jean Chalard
Browse files

Fix Eclipse warnings.

This change is only there to fix warning issued by Eclipse.
It should have absolutely no impact on the program logic.

Change-Id: Ie0e242ac6c167297d33de19902340b0f6ecae9e1
parent 4556de4b
No related branches found
No related tags found
No related merge requests found
Showing
with 15 additions and 22 deletions
...@@ -118,7 +118,7 @@ public class InputMethodManagerCompatWrapper { ...@@ -118,7 +118,7 @@ public class InputMethodManagerCompatWrapper {
} }
Object retval = CompatUtils.invoke(mImm, null, METHOD_getEnabledInputMethodSubtypeList, Object retval = CompatUtils.invoke(mImm, null, METHOD_getEnabledInputMethodSubtypeList,
(imi != null ? imi.getInputMethodInfo() : null), allowsImplicitlySelectedSubtypes); (imi != null ? imi.getInputMethodInfo() : null), allowsImplicitlySelectedSubtypes);
if (retval == null || !(retval instanceof List) || ((List<?>)retval).isEmpty()) { if (retval == null || !(retval instanceof List<?>) || ((List<?>)retval).isEmpty()) {
if (!FORCE_ENABLE_VOICE_EVEN_WITH_NO_VOICE_SUBTYPES) { if (!FORCE_ENABLE_VOICE_EVEN_WITH_NO_VOICE_SUBTYPES) {
// Returns an empty list // Returns an empty list
return Collections.emptyList(); return Collections.emptyList();
...@@ -137,7 +137,7 @@ public class InputMethodManagerCompatWrapper { ...@@ -137,7 +137,7 @@ public class InputMethodManagerCompatWrapper {
} }
return subtypeList; return subtypeList;
} }
return CompatUtils.copyInputMethodSubtypeListToWrapper((List<?>)retval); return CompatUtils.copyInputMethodSubtypeListToWrapper(retval);
} }
private InputMethodInfoCompatWrapper getLatinImeInputMethodInfo() { private InputMethodInfoCompatWrapper getLatinImeInputMethodInfo() {
...@@ -159,7 +159,7 @@ public class InputMethodManagerCompatWrapper { ...@@ -159,7 +159,7 @@ public class InputMethodManagerCompatWrapper {
public Map<InputMethodInfoCompatWrapper, List<InputMethodSubtypeCompatWrapper>> public Map<InputMethodInfoCompatWrapper, List<InputMethodSubtypeCompatWrapper>>
getShortcutInputMethodsAndSubtypes() { getShortcutInputMethodsAndSubtypes() {
Object retval = CompatUtils.invoke(mImm, null, METHOD_getShortcutInputMethodsAndSubtypes); Object retval = CompatUtils.invoke(mImm, null, METHOD_getShortcutInputMethodsAndSubtypes);
if (retval == null || !(retval instanceof Map) || ((Map<?, ?>)retval).isEmpty()) { if (retval == null || !(retval instanceof Map<?, ?>) || ((Map<?, ?>)retval).isEmpty()) {
if (!FORCE_ENABLE_VOICE_EVEN_WITH_NO_VOICE_SUBTYPES) { if (!FORCE_ENABLE_VOICE_EVEN_WITH_NO_VOICE_SUBTYPES) {
// Returns an empty map // Returns an empty map
return Collections.emptyMap(); return Collections.emptyMap();
......
...@@ -754,15 +754,15 @@ public class VoiceProxy implements VoiceInput.UiListener { ...@@ -754,15 +754,15 @@ public class VoiceProxy implements VoiceInput.UiListener {
} }
public static class VoiceLoggerWrapper { public static class VoiceLoggerWrapper {
private static final VoiceLoggerWrapper sInstance = new VoiceLoggerWrapper(); private static final VoiceLoggerWrapper sLoggerWrapperInstance = new VoiceLoggerWrapper();
private VoiceInputLogger mLogger; private VoiceInputLogger mLogger;
public static VoiceLoggerWrapper getInstance(Context context) { public static VoiceLoggerWrapper getInstance(Context context) {
if (sInstance.mLogger == null) { if (sLoggerWrapperInstance.mLogger == null) {
// Not thread safe, but it's ok. // Not thread safe, but it's ok.
sInstance.mLogger = VoiceInputLogger.getLogger(context); sLoggerWrapperInstance.mLogger = VoiceInputLogger.getLogger(context);
} }
return sInstance; return sLoggerWrapperInstance;
} }
// private for the singleton // private for the singleton
...@@ -795,10 +795,10 @@ public class VoiceProxy implements VoiceInput.UiListener { ...@@ -795,10 +795,10 @@ public class VoiceProxy implements VoiceInput.UiListener {
} }
public static class VoiceInputWrapper { public static class VoiceInputWrapper {
private static final VoiceInputWrapper sInstance = new VoiceInputWrapper(); private static final VoiceInputWrapper sInputWrapperInstance = new VoiceInputWrapper();
private VoiceInput mVoiceInput; private VoiceInput mVoiceInput;
public static VoiceInputWrapper getInstance() { public static VoiceInputWrapper getInstance() {
return sInstance; return sInputWrapperInstance;
} }
public void setVoiceInput(VoiceInput voiceInput, SubtypeSwitcher switcher) { public void setVoiceInput(VoiceInput voiceInput, SubtypeSwitcher switcher) {
if (mVoiceInput == null && voiceInput != null) { if (mVoiceInput == null && voiceInput != null) {
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package com.android.inputmethod.deprecated.languageswitcher; package com.android.inputmethod.deprecated.languageswitcher;
import com.android.inputmethod.compat.InputMethodSubtypeCompatWrapper;
import com.android.inputmethod.latin.LatinIME; import com.android.inputmethod.latin.LatinIME;
import com.android.inputmethod.latin.LatinImeLogger; import com.android.inputmethod.latin.LatinImeLogger;
import com.android.inputmethod.latin.Settings; import com.android.inputmethod.latin.Settings;
...@@ -38,6 +37,7 @@ import java.util.Locale; ...@@ -38,6 +37,7 @@ import java.util.Locale;
public class LanguageSwitcher { public class LanguageSwitcher {
private static final String TAG = LanguageSwitcher.class.getSimpleName(); private static final String TAG = LanguageSwitcher.class.getSimpleName();
@SuppressWarnings("unused")
private static final String KEYBOARD_MODE = "keyboard"; private static final String KEYBOARD_MODE = "keyboard";
private static final String[] EMPTY_STIRNG_ARRAY = new String[0]; private static final String[] EMPTY_STIRNG_ARRAY = new String[0];
...@@ -154,7 +154,6 @@ public class LanguageSwitcher { ...@@ -154,7 +154,6 @@ public class LanguageSwitcher {
/** /**
* Returns the currently selected input locale, or the display locale if no specific * Returns the currently selected input locale, or the display locale if no specific
* locale was selected for input. * locale was selected for input.
* @return
*/ */
public Locale getInputLocale() { public Locale getInputLocale() {
if (getLocaleCount() == 0) return mDefaultInputLocale; if (getLocaleCount() == 0) return mDefaultInputLocale;
...@@ -175,7 +174,6 @@ public class LanguageSwitcher { ...@@ -175,7 +174,6 @@ public class LanguageSwitcher {
/** /**
* Returns the next input locale in the list. Wraps around to the beginning of the * Returns the next input locale in the list. Wraps around to the beginning of the
* list if we're at the end of the list. * list if we're at the end of the list.
* @return
*/ */
public Locale getNextInputLocale() { public Locale getNextInputLocale() {
if (getLocaleCount() == 0) return mDefaultInputLocale; if (getLocaleCount() == 0) return mDefaultInputLocale;
...@@ -201,7 +199,6 @@ public class LanguageSwitcher { ...@@ -201,7 +199,6 @@ public class LanguageSwitcher {
/** /**
* Returns the previous input locale in the list. Wraps around to the end of the * Returns the previous input locale in the list. Wraps around to the end of the
* list if we're at the beginning of the list. * list if we're at the beginning of the list.
* @return
*/ */
public Locale getPrevInputLocale() { public Locale getPrevInputLocale() {
if (getLocaleCount() == 0) return mDefaultInputLocale; if (getLocaleCount() == 0) return mDefaultInputLocale;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
package com.android.inputmethod.deprecated.voice; package com.android.inputmethod.deprecated.voice;
import com.android.common.speech.LoggingEvents; import com.android.common.speech.LoggingEvents;
import com.android.common.userhappiness.UserHappinessSignals;
import com.android.inputmethod.deprecated.compat.VoiceInputLoggerCompatUtils; import com.android.inputmethod.deprecated.compat.VoiceInputLoggerCompatUtils;
import android.content.Context; import android.content.Context;
......
...@@ -145,7 +145,7 @@ public class BinaryDictionary extends Dictionary { ...@@ -145,7 +145,7 @@ public class BinaryDictionary extends Dictionary {
* @param context application context for reading resources * @param context application context for reading resources
* @param dicTypeId the type of the dictionary being created, out of the list in Suggest.DIC_* * @param dicTypeId the type of the dictionary being created, out of the list in Suggest.DIC_*
* @param locale the locale for which to create the dictionary * @param locale the locale for which to create the dictionary
* @param fallBackResId the id of the resource to use as a fallback if no pack is found * @param fallbackResId the id of the resource to use as a fallback if no pack is found
* @return an initialized instance of BinaryDictionary * @return an initialized instance of BinaryDictionary
*/ */
public static BinaryDictionary initDictionaryFromManager(Context context, int dicTypeId, public static BinaryDictionary initDictionaryFromManager(Context context, int dicTypeId,
......
...@@ -65,9 +65,6 @@ class BinaryDictionaryGetter { ...@@ -65,9 +65,6 @@ class BinaryDictionaryGetter {
* If that fails: * If that fails:
* - Returns null. * - Returns null.
* @return The address of a valid file, or null. * @return The address of a valid file, or null.
* @throws FileNotFoundException if a dictionary provider returned a file name, but the
* file cannot be found.
* @throws IOException if there was an I/O problem reading or copying a file.
*/ */
public static AssetFileAddress getDictionaryFile(Locale locale, Context context, public static AssetFileAddress getDictionaryFile(Locale locale, Context context,
int fallbackResId) { int fallbackResId) {
......
...@@ -61,7 +61,7 @@ public abstract class Dictionary { ...@@ -61,7 +61,7 @@ public abstract class Dictionary {
* words are added through the callback object. * words are added through the callback object.
* @param composer the key sequence to match * @param composer the key sequence to match
* @param callback the callback object to send matched words to as possible candidates * @param callback the callback object to send matched words to as possible candidates
* @see WordCallback#addWord(char[], int, int) * @see WordCallback#addWord(char[], int, int, int, int, DataType)
*/ */
abstract public void getWords(final WordComposer composer, final WordCallback callback); abstract public void getWords(final WordComposer composer, final WordCallback callback);
......
...@@ -73,7 +73,7 @@ public class EditingUtils { ...@@ -73,7 +73,7 @@ public class EditingUtils {
/** /**
* @param connection connection to the current text field. * @param connection connection to the current text field.
* @param sep characters which may separate words * @param separators characters which may separate words
* @return the word that surrounds the cursor, including up to one trailing * @return the word that surrounds the cursor, including up to one trailing
* separator. For example, if the field contains "he|llo world", where | * separator. For example, if the field contains "he|llo world", where |
* represents the cursor, then "hello " will be returned. * represents the cursor, then "hello " will be returned.
......
...@@ -56,7 +56,7 @@ public class Suggest implements Dictionary.WordCallback { ...@@ -56,7 +56,7 @@ public class Suggest implements Dictionary.WordCallback {
/** /**
* Maximum possible bigram frequency. Will depend on how many bits are being used in data * Maximum possible bigram frequency. Will depend on how many bits are being used in data
* structure. Maximum bigram freqeuncy will get the BIGRAM_MULTIPLIER_MAX as the multiplier. * structure. Maximum bigram frequency will get the BIGRAM_MULTIPLIER_MAX as the multiplier.
*/ */
public static final int MAXIMUM_BIGRAM_FREQUENCY = 127; public static final int MAXIMUM_BIGRAM_FREQUENCY = 127;
......
...@@ -648,6 +648,6 @@ public class Utils { ...@@ -648,6 +648,6 @@ public class Utils {
/** Convert pixel to DIP */ /** Convert pixel to DIP */
public static int dipToPixel(float scale, int dip) { public static int dipToPixel(float scale, int dip) {
return (int) ((float) dip * scale + 0.5); return (int) (dip * scale + 0.5);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment