From a69f12a246b6c047faf7002a57b1cebc3721d731 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Mon, 9 Jul 2012 17:58:40 +0900
Subject: [PATCH] Reduce method visibility (A88)
Change-Id: I29d6afbcba0998558c9b19287a460d9f0e410994
---
java/src/com/android/inputmethod/latin/BinaryDictionary.java | 4 ++--
java/src/com/android/inputmethod/latin/Dictionary.java | 4 ++--
.../com/android/inputmethod/latin/DictionaryCollection.java | 4 ++--
.../android/inputmethod/latin/ExpandableBinaryDictionary.java | 4 ++--
.../com/android/inputmethod/latin/ExpandableDictionary.java | 4 ++--
.../latin/SynchronouslyLoadedContactsBinaryDictionary.java | 2 +-
.../latin/SynchronouslyLoadedUserBinaryDictionary.java | 2 +-
.../com/android/inputmethod/latin/UserHistoryDictionary.java | 2 +-
.../com/android/inputmethod/latin/WhitelistDictionary.java | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index ae415d0ab1..15646b8714 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -106,7 +106,7 @@ public class BinaryDictionary extends Dictionary {
}
@Override
- public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
+ protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
final CharSequence previousWord) {
if (mNativeDict == 0) return null;
@@ -145,7 +145,7 @@ public class BinaryDictionary extends Dictionary {
// proximityInfo and/or prevWordForBigrams may not be null.
@Override
- public ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+ protected ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
final int count = getSuggestions(codes, prevWordForBigrams, proximityInfo, mOutputChars,
mScores, mSpaceIndices);
diff --git a/java/src/com/android/inputmethod/latin/Dictionary.java b/java/src/com/android/inputmethod/latin/Dictionary.java
index 5229d14fa3..4b02e11bfe 100644
--- a/java/src/com/android/inputmethod/latin/Dictionary.java
+++ b/java/src/com/android/inputmethod/latin/Dictionary.java
@@ -78,7 +78,7 @@ public abstract class Dictionary {
* @param proximityInfo the object for key proximity. May be ignored by some implementations.
* @return the list of suggestions
*/
- abstract public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
+ abstract protected ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo);
/**
@@ -87,7 +87,7 @@ public abstract class Dictionary {
* @param previousWord the word before
* @return the list of suggestions
*/
- public abstract ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
+ abstract protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
final CharSequence previousWord);
/**
diff --git a/java/src/com/android/inputmethod/latin/DictionaryCollection.java b/java/src/com/android/inputmethod/latin/DictionaryCollection.java
index dcc53c59f9..d2ddebf3e8 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryCollection.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryCollection.java
@@ -55,7 +55,7 @@ public class DictionaryCollection extends Dictionary {
}
@Override
- public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
+ protected ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
final CopyOnWriteArrayList<Dictionary> dictionaries = mDictionaries;
if (dictionaries.isEmpty()) return null;
@@ -74,7 +74,7 @@ public class DictionaryCollection extends Dictionary {
}
@Override
- public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
+ protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
final CharSequence previousWord) {
final CopyOnWriteArrayList<Dictionary> dictionaries = mDictionaries;
if (dictionaries.isEmpty()) return null;
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 1cda9f2573..40d46a8738 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -192,7 +192,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
}
@Override
- public ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+ protected ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
asyncReloadDictionaryIfRequired();
return getWordsInner(codes, prevWordForBigrams, proximityInfo);
@@ -215,7 +215,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
}
@Override
- public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
+ protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
final CharSequence previousWord) {
asyncReloadDictionaryIfRequired();
return getBigramsInner(codes, previousWord);
diff --git a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java
index 55a25777a6..a3c183c278 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java
@@ -247,7 +247,7 @@ public class ExpandableDictionary extends Dictionary {
}
@Override
- public ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+ protected ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
if (reloadDictionaryIfRequired()) return null;
if (codes.size() >= BinaryDictionary.MAX_WORD_LENGTH) {
@@ -270,7 +270,7 @@ public class ExpandableDictionary extends Dictionary {
}
@Override
- public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
+ protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
final CharSequence previousWord) {
if (reloadDictionaryIfRequired()) return null;
final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>();
diff --git a/java/src/com/android/inputmethod/latin/SynchronouslyLoadedContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/SynchronouslyLoadedContactsBinaryDictionary.java
index 9b20bd6903..59bd249e79 100644
--- a/java/src/com/android/inputmethod/latin/SynchronouslyLoadedContactsBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/SynchronouslyLoadedContactsBinaryDictionary.java
@@ -32,7 +32,7 @@ public class SynchronouslyLoadedContactsBinaryDictionary extends ContactsBinaryD
}
@Override
- public synchronized ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+ protected synchronized ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
syncReloadDictionaryIfRequired();
return getWordsInner(codes, prevWordForBigrams, proximityInfo);
diff --git a/java/src/com/android/inputmethod/latin/SynchronouslyLoadedUserBinaryDictionary.java b/java/src/com/android/inputmethod/latin/SynchronouslyLoadedUserBinaryDictionary.java
index 5b2a6edec3..7abc251be1 100644
--- a/java/src/com/android/inputmethod/latin/SynchronouslyLoadedUserBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/SynchronouslyLoadedUserBinaryDictionary.java
@@ -35,7 +35,7 @@ public class SynchronouslyLoadedUserBinaryDictionary extends UserBinaryDictionar
}
@Override
- public synchronized ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+ protected synchronized ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
syncReloadDictionaryIfRequired();
return getWordsInner(codes, prevWordForBigrams, proximityInfo);
diff --git a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
index d742e21907..e26349172e 100644
--- a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
@@ -161,7 +161,7 @@ public class UserHistoryDictionary extends ExpandableDictionary {
}
@Override
- public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
+ protected ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
final CharSequence prevWord, final ProximityInfo proximityInfo) {
// User history unigrams are not used at this moment. Implement this method to make them
// useful.
diff --git a/java/src/com/android/inputmethod/latin/WhitelistDictionary.java b/java/src/com/android/inputmethod/latin/WhitelistDictionary.java
index 24c94992fa..be2c80e0e5 100644
--- a/java/src/com/android/inputmethod/latin/WhitelistDictionary.java
+++ b/java/src/com/android/inputmethod/latin/WhitelistDictionary.java
@@ -92,7 +92,7 @@ public class WhitelistDictionary extends ExpandableDictionary {
}
@Override
- public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
+ protected ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
final CharSequence prevWord, final ProximityInfo proximityInfo) {
// Whitelist does not supply suggestions (actually it should not even implement the
// Dictionary interface, as it responds to none of it, but it does for legacy reasons)
--
GitLab