Fix confusable "label" usage, use "text" instead
* Rename makelabel tool to maketext
* Rename KeyboardLablesSet class to KeyboardTextsSet
* Rename "!label/name" to "!text/name"
Change-Id: Ia9494a89fe56f20ca8e8fedb253adbcf8b771bd3
diff --git a/tools/makelabel/etc/manifest.txt b/tools/makelabel/etc/manifest.txt
deleted file mode 100644
index 18bf0be..0000000
--- a/tools/makelabel/etc/manifest.txt
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: com.android.inputmethod.latin.makelabel.LabelMaker
diff --git a/tools/makelabel/Android.mk b/tools/maketext/Android.mk
similarity index 96%
rename from tools/makelabel/Android.mk
rename to tools/maketext/Android.mk
index 9fa8650..98731b7 100644
--- a/tools/makelabel/Android.mk
+++ b/tools/maketext/Android.mk
@@ -20,7 +20,7 @@
LOCAL_JAR_MANIFEST := etc/manifest.txt
LOCAL_JAVA_RESOURCE_DIRS := res
LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE := makelabel
+LOCAL_MODULE := maketext
include $(BUILD_HOST_JAVA_LIBRARY)
include $(LOCAL_PATH)/etc/Android.mk
diff --git a/tools/makelabel/etc/Android.mk b/tools/maketext/etc/Android.mk
similarity index 94%
rename from tools/makelabel/etc/Android.mk
rename to tools/maketext/etc/Android.mk
index 2d2e9a6..4fa194b 100644
--- a/tools/makelabel/etc/Android.mk
+++ b/tools/maketext/etc/Android.mk
@@ -17,5 +17,5 @@
LOCAL_MODULE_TAGS := eng
-LOCAL_PREBUILT_EXECUTABLES := makelabel
+LOCAL_PREBUILT_EXECUTABLES := maketext
include $(BUILD_HOST_PREBUILT)
diff --git a/tools/makelabel/etc/makelabel b/tools/maketext/etc/maketext
similarity index 98%
rename from tools/makelabel/etc/makelabel
rename to tools/maketext/etc/maketext
index 44a05b6..0edd360 100755
--- a/tools/makelabel/etc/makelabel
+++ b/tools/maketext/etc/maketext
@@ -33,7 +33,7 @@
prog="${progdir}"/`basename "${prog}"`
cd "${oldwd}"
-jarfile=makelabel.jar
+jarfile=maketext.jar
frameworkdir="$progdir"
if [ ! -r "$frameworkdir/$jarfile" ]
then
diff --git a/tools/maketext/etc/manifest.txt b/tools/maketext/etc/manifest.txt
new file mode 100644
index 0000000..bfd1a52
--- /dev/null
+++ b/tools/maketext/etc/manifest.txt
@@ -0,0 +1 @@
+Main-Class: com.android.inputmethod.latin.maketext.LabelText
diff --git a/tools/makelabel/res/com/android/inputmethod/keyboard/internal/KeyboardLabelsSet.tmpl b/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
similarity index 65%
rename from tools/makelabel/res/com/android/inputmethod/keyboard/internal/KeyboardLabelsSet.tmpl
rename to tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
index 72f4edd..5a19338 100644
--- a/tools/makelabel/res/com/android/inputmethod/keyboard/internal/KeyboardLabelsSet.tmpl
+++ b/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
@@ -25,23 +25,23 @@
/**
* !!!!! DO NOT EDIT THIS FILE !!!!!
- * This file is generated by tools/makelabel.
+ * This file is generated by tools/maketext.
*/
-public final class KeyboardLabelsSet {
- // Language to labels map.
- private static final HashMap<String, String[]> sLocaleToLabelsMap =
+public final class KeyboardTextsSet {
+ // Language to texts map.
+ private static final HashMap<String, String[]> sLocaleToTextsMap =
new HashMap<String, String[]>();
private static final HashMap<String, Integer> sLowerCaseNameToIdsMap =
new HashMap<String, Integer>();
- private String[] mLabels;
- // Resource name to label map.
- private HashMap<String, String> mResourceNameToLabelsMap = new HashMap<String, String>();
+ private String[] mTexts;
+ // Resource name to text map.
+ private HashMap<String, String> mResourceNameToTextsMap = new HashMap<String, String>();
public void setLanguage(final String language) {
- mLabels = sLocaleToLabelsMap.get(language);
- if (mLabels == null) {
- mLabels = LANGUAGE_DEFAULT;
+ mTexts = sLocaleToTextsMap.get(language);
+ if (mTexts == null) {
+ mTexts = LANGUAGE_DEFAULT;
}
}
@@ -56,31 +56,31 @@
final String packageName = res.getResourcePackageName(referenceId);
for (final String resName : resourceNames) {
final int resId = res.getIdentifier(resName, "string", packageName);
- mResourceNameToLabelsMap.put(resName, res.getString(resId));
+ mResourceNameToTextsMap.put(resName, res.getString(resId));
}
}
- public String getLabel(final String name) {
+ public String getText(final String name) {
String lowerCaseName = null;
- String label = mResourceNameToLabelsMap.get(name);
- if (label == null) {
+ String text = mResourceNameToTextsMap.get(name);
+ if (text == null) {
lowerCaseName = name.toLowerCase();
- label = mResourceNameToLabelsMap.get(lowerCaseName);
+ text = mResourceNameToTextsMap.get(lowerCaseName);
}
- if (label != null) {
- return label;
+ if (text != null) {
+ return text;
}
Integer id = sLowerCaseNameToIdsMap.get(name);
if (id == null) {
id = sLowerCaseNameToIdsMap.get(lowerCaseName); // lowerCaseName != null
}
if (id == null) throw new RuntimeException("Unknown label: " + name);
- label = (id < mLabels.length) ? mLabels[id] : null;
- return (label == null) ? LANGUAGE_DEFAULT[id] : label;
+ text = (id < mTexts.length) ? mTexts[id] : null;
+ return (text == null) ? LANGUAGE_DEFAULT[id] : text;
}
private static final String[] RESOURCE_NAMES = {
- // These labels' name should be aligned with the @string/<name> in values/strings.xml.
+ // These texts' name should be aligned with the @string/<name> in values/strings.xml.
// Labels for action.
"label_go_key",
// "label_search_key",
@@ -102,14 +102,14 @@
private static final String EMPTY = "";
- /* Default labels */
+ /* Default texts */
private static final String[] LANGUAGE_DEFAULT = {
- /* @DEFAULT_LABELS@ */
+ /* @DEFAULT_TEXTS@ */
};
- /* @LABELS@ */
- private static final Object[] LANGUAGES_AND_LABELS = {
- /* @LANGUAGES_AND_LABELS@ */
+ /* @TEXTS@ */
+ private static final Object[] LANGUAGES_AND_TEXTS = {
+ /* @LANGUAGES_AND_TEXTS@ */
};
static {
@@ -118,10 +118,10 @@
sLowerCaseNameToIdsMap.put(name, id++);
}
- for (int i = 0; i < LANGUAGES_AND_LABELS.length; i += 2) {
- final String language = (String)LANGUAGES_AND_LABELS[i];
- final String[] labels = (String[])LANGUAGES_AND_LABELS[i + 1];
- sLocaleToLabelsMap.put(language, labels);
+ for (int i = 0; i < LANGUAGES_AND_TEXTS.length; i += 2) {
+ final String language = (String)LANGUAGES_AND_TEXTS[i];
+ final String[] texts = (String[])LANGUAGES_AND_TEXTS[i + 1];
+ sLocaleToTextsMap.put(language, texts);
}
}
}
diff --git a/tools/makelabel/res/values-ar/donottranslate-more-keys.xml b/tools/maketext/res/values-ar/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-ar/donottranslate-more-keys.xml
rename to tools/maketext/res/values-ar/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-be/donottranslate-more-keys.xml b/tools/maketext/res/values-be/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-be/donottranslate-more-keys.xml
rename to tools/maketext/res/values-be/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-ca/donottranslate-more-keys.xml b/tools/maketext/res/values-ca/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-ca/donottranslate-more-keys.xml
rename to tools/maketext/res/values-ca/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-cs/donottranslate-more-keys.xml b/tools/maketext/res/values-cs/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-cs/donottranslate-more-keys.xml
rename to tools/maketext/res/values-cs/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-da/donottranslate-more-keys.xml b/tools/maketext/res/values-da/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-da/donottranslate-more-keys.xml
rename to tools/maketext/res/values-da/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-de/donottranslate-more-keys.xml b/tools/maketext/res/values-de/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-de/donottranslate-more-keys.xml
rename to tools/maketext/res/values-de/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-en/donottranslate-more-keys.xml b/tools/maketext/res/values-en/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-en/donottranslate-more-keys.xml
rename to tools/maketext/res/values-en/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-es/donottranslate-more-keys.xml b/tools/maketext/res/values-es/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-es/donottranslate-more-keys.xml
rename to tools/maketext/res/values-es/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-et/donottranslate-more-keys.xml b/tools/maketext/res/values-et/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-et/donottranslate-more-keys.xml
rename to tools/maketext/res/values-et/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-fa/donottranslate-more-keys.xml b/tools/maketext/res/values-fa/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-fa/donottranslate-more-keys.xml
rename to tools/maketext/res/values-fa/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-fi/donottranslate-more-keys.xml b/tools/maketext/res/values-fi/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-fi/donottranslate-more-keys.xml
rename to tools/maketext/res/values-fi/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-fr/donottranslate-more-keys.xml b/tools/maketext/res/values-fr/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-fr/donottranslate-more-keys.xml
rename to tools/maketext/res/values-fr/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-hi/donottranslate-more-keys.xml b/tools/maketext/res/values-hi/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-hi/donottranslate-more-keys.xml
rename to tools/maketext/res/values-hi/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-hr/donottranslate-more-keys.xml b/tools/maketext/res/values-hr/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-hr/donottranslate-more-keys.xml
rename to tools/maketext/res/values-hr/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-hu/donottranslate-more-keys.xml b/tools/maketext/res/values-hu/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-hu/donottranslate-more-keys.xml
rename to tools/maketext/res/values-hu/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-is/donottranslate-more-keys.xml b/tools/maketext/res/values-is/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-is/donottranslate-more-keys.xml
rename to tools/maketext/res/values-is/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-it/donottranslate-more-keys.xml b/tools/maketext/res/values-it/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-it/donottranslate-more-keys.xml
rename to tools/maketext/res/values-it/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-iw/donottranslate-more-keys.xml b/tools/maketext/res/values-iw/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-iw/donottranslate-more-keys.xml
rename to tools/maketext/res/values-iw/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-ky/donottranslate-more-keys.xml b/tools/maketext/res/values-ky/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-ky/donottranslate-more-keys.xml
rename to tools/maketext/res/values-ky/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-lt/donottranslate-more-keys.xml b/tools/maketext/res/values-lt/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-lt/donottranslate-more-keys.xml
rename to tools/maketext/res/values-lt/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-lv/donottranslate-more-keys.xml b/tools/maketext/res/values-lv/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-lv/donottranslate-more-keys.xml
rename to tools/maketext/res/values-lv/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-mk/donottranslate-more-keys.xml b/tools/maketext/res/values-mk/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-mk/donottranslate-more-keys.xml
rename to tools/maketext/res/values-mk/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-nb/donottranslate-more-keys.xml b/tools/maketext/res/values-nb/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-nb/donottranslate-more-keys.xml
rename to tools/maketext/res/values-nb/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-nl/donottranslate-more-keys.xml b/tools/maketext/res/values-nl/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-nl/donottranslate-more-keys.xml
rename to tools/maketext/res/values-nl/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-pl/donottranslate-more-keys.xml b/tools/maketext/res/values-pl/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-pl/donottranslate-more-keys.xml
rename to tools/maketext/res/values-pl/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-pt/donottranslate-more-keys.xml b/tools/maketext/res/values-pt/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-pt/donottranslate-more-keys.xml
rename to tools/maketext/res/values-pt/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-rm/donottranslate-more-keys.xml b/tools/maketext/res/values-rm/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-rm/donottranslate-more-keys.xml
rename to tools/maketext/res/values-rm/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-ro/donottranslate-more-keys.xml b/tools/maketext/res/values-ro/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-ro/donottranslate-more-keys.xml
rename to tools/maketext/res/values-ro/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-ru/donottranslate-more-keys.xml b/tools/maketext/res/values-ru/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-ru/donottranslate-more-keys.xml
rename to tools/maketext/res/values-ru/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-sk/donottranslate-more-keys.xml b/tools/maketext/res/values-sk/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-sk/donottranslate-more-keys.xml
rename to tools/maketext/res/values-sk/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-sl/donottranslate-more-keys.xml b/tools/maketext/res/values-sl/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-sl/donottranslate-more-keys.xml
rename to tools/maketext/res/values-sl/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-sr/donottranslate-more-keys.xml b/tools/maketext/res/values-sr/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-sr/donottranslate-more-keys.xml
rename to tools/maketext/res/values-sr/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-sv/donottranslate-more-keys.xml b/tools/maketext/res/values-sv/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-sv/donottranslate-more-keys.xml
rename to tools/maketext/res/values-sv/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-tr/donottranslate-more-keys.xml b/tools/maketext/res/values-tr/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-tr/donottranslate-more-keys.xml
rename to tools/maketext/res/values-tr/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-uk/donottranslate-more-keys.xml b/tools/maketext/res/values-uk/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-uk/donottranslate-more-keys.xml
rename to tools/maketext/res/values-uk/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-vi/donottranslate-more-keys.xml b/tools/maketext/res/values-vi/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-vi/donottranslate-more-keys.xml
rename to tools/maketext/res/values-vi/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-zz/donottranslate-more-keys.xml b/tools/maketext/res/values-zz/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values-zz/donottranslate-more-keys.xml
rename to tools/maketext/res/values-zz/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values/donottranslate-more-keys.xml b/tools/maketext/res/values/donottranslate-more-keys.xml
similarity index 100%
rename from tools/makelabel/res/values/donottranslate-more-keys.xml
rename to tools/maketext/res/values/donottranslate-more-keys.xml
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/ArrayInitializerFormatter.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/ArrayInitializerFormatter.java
similarity index 97%
rename from tools/makelabel/src/com/android/inputmethod/latin/makelabel/ArrayInitializerFormatter.java
rename to tools/maketext/src/com/android/inputmethod/latin/maketext/ArrayInitializerFormatter.java
index 0cf2991..3365c72 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/ArrayInitializerFormatter.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/ArrayInitializerFormatter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
import java.io.PrintStream;
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/JarUtils.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/JarUtils.java
similarity index 97%
rename from tools/makelabel/src/com/android/inputmethod/latin/makelabel/JarUtils.java
rename to tools/maketext/src/com/android/inputmethod/latin/maketext/JarUtils.java
index b24b2ca..366d73e 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/JarUtils.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/JarUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
import java.io.IOException;
import java.io.InputStream;
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/LabelMaker.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/LabelText.java
similarity index 92%
rename from tools/makelabel/src/com/android/inputmethod/latin/makelabel/LabelMaker.java
rename to tools/maketext/src/com/android/inputmethod/latin/maketext/LabelText.java
index e02f802..a5abcf1 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/LabelMaker.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/LabelText.java
@@ -14,14 +14,14 @@
* the License.
*/
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.NoSuchElementException;
import java.util.jar.JarFile;
-public class LabelMaker {
+public class LabelText {
static class Options {
private static final String OPTION_JAVA = "-java";
@@ -58,7 +58,7 @@
public static void main(final String[] args) {
final Options options = new Options(args);
- final JarFile jar = JarUtils.getJarFile(LabelMaker.class.getClassLoader());
+ final JarFile jar = JarUtils.getJarFile(LabelText.class.getClassLoader());
final MoreKeysResources resources = new MoreKeysResources(jar);
resources.writeToJava(options.mJava);
}
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/MoreKeysResources.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/MoreKeysResources.java
similarity index 88%
rename from tools/makelabel/src/com/android/inputmethod/latin/makelabel/MoreKeysResources.java
rename to tools/maketext/src/com/android/inputmethod/latin/maketext/MoreKeysResources.java
index 1dfb853..a483593 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/MoreKeysResources.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/MoreKeysResources.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
import java.io.Closeable;
import java.io.File;
@@ -30,13 +30,13 @@
import java.util.jar.JarFile;
public class MoreKeysResources {
- private static final String LABEL_RESOURCE_NAME = "donottranslate-more-keys.xml";
+ private static final String TEXT_RESOURCE_NAME = "donottranslate-more-keys.xml";
- private static final String JAVA_TEMPLATE = "KeyboardLabelsSet.tmpl";
+ private static final String JAVA_TEMPLATE = "KeyboardTextsSet.tmpl";
private static final String MARK_NAMES = "@NAMES@";
- private static final String MARK_DEFAULT_LABELS = "@DEFAULT_LABELS@";
- private static final String MARK_LABELS = "@LABELS@";
- private static final String MARK_LANGUAGES_AND_LABELS = "@LANGUAGES_AND_LABELS@";
+ private static final String MARK_DEFAULT_TEXTS = "@DEFAULT_TEXTS@";
+ private static final String MARK_TEXTS = "@TEXTS@";
+ private static final String MARK_LANGUAGES_AND_TEXTS = "@LANGUAGES_AND_TEXTS@";
private static final String DEFAUT_LANGUAGE_NAME = "DEFAULT";
private static final String ARRAY_NAME_FOR_LANGUAGE = "LANGUAGE_%s";
private static final String EMPTY_STRING_VAR = "EMPTY";
@@ -53,7 +53,7 @@
public MoreKeysResources(final JarFile jar) {
mJar = jar;
- final ArrayList<String> resources = JarUtils.getNameListing(jar, LABEL_RESOURCE_NAME);
+ final ArrayList<String> resources = JarUtils.getNameListing(jar, TEXT_RESOURCE_NAME);
for (final String name : resources) {
final String dirName = name.substring(0, name.lastIndexOf('/'));
final int pos = dirName.lastIndexOf('/');
@@ -118,11 +118,11 @@
while ((line = in.readLine()) != null) {
if (line.contains(MARK_NAMES)) {
dumpNames(out);
- } else if (line.contains(MARK_DEFAULT_LABELS)) {
- dumpDefaultLabels(out);
- } else if (line.contains(MARK_LABELS)) {
- dumpLabels(out);
- } else if (line.contains(MARK_LANGUAGES_AND_LABELS)) {
+ } else if (line.contains(MARK_DEFAULT_TEXTS)) {
+ dumpDefaultTexts(out);
+ } else if (line.contains(MARK_TEXTS)) {
+ dumpTexts(out);
+ } else if (line.contains(MARK_LANGUAGES_AND_TEXTS)) {
dumpLanguageMap(out);
} else {
out.println(line);
@@ -140,12 +140,12 @@
}
}
- private void dumpDefaultLabels(final PrintStream out) {
+ private void dumpDefaultTexts(final PrintStream out) {
final StringResourceMap defaultResMap = mResourcesMap.get(DEFAUT_LANGUAGE_NAME);
- dumpLabelsInternal(out, defaultResMap, defaultResMap);
+ dumpTextsInternal(out, defaultResMap, defaultResMap);
}
- private void dumpLabels(final PrintStream out) {
+ private void dumpTexts(final PrintStream out) {
final StringResourceMap defaultResMap = mResourcesMap.get(DEFAUT_LANGUAGE_NAME);
final ArrayList<String> allLanguages = new ArrayList<String>();
allLanguages.addAll(mResourcesMap.keySet());
@@ -158,7 +158,7 @@
out.format(" private static final String[] " + ARRAY_NAME_FOR_LANGUAGE + " = {\n",
language);
final StringResourceMap resMap = mResourcesMap.get(language);
- dumpLabelsInternal(out, resMap, defaultResMap);
+ dumpTextsInternal(out, resMap, defaultResMap);
out.format(" };\n\n");
}
}
@@ -181,7 +181,7 @@
}
}
- private static void dumpLabelsInternal(final PrintStream out, final StringResourceMap resMap,
+ private static void dumpTextsInternal(final PrintStream out, final StringResourceMap resMap,
final StringResourceMap defaultResMap) {
final ArrayInitializerFormatter formatter =
new ArrayInitializerFormatter(out, 100, " ");
@@ -235,7 +235,7 @@
String t = text;
t = replaceAll(t, "\\?", "?");
t = replaceAll(t, "\\@", "@");
- t = replaceAll(t, "@string/", "!label/");
+ t = replaceAll(t, "@string/", "!text/");
return t;
}
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResource.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResource.java
similarity index 94%
rename from tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResource.java
rename to tools/maketext/src/com/android/inputmethod/latin/maketext/StringResource.java
index 793483c..568a896 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResource.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResource.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
public class StringResource {
public final String mName;
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResourceMap.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResourceMap.java
similarity index 98%
rename from tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResourceMap.java
rename to tools/maketext/src/com/android/inputmethod/latin/maketext/StringResourceMap.java
index 764421f..6ceea5a 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResourceMap.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResourceMap.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;