AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-2253 Make nullLanguageCode be 0, misc. related clean-up.

Browse Source 
X-SVN-Rev: 11551
This commit is contained in:
Eric Mader 2003-04-15 20:15:53 +00:00
parent db9ad2d480
commit 877192fcb4
4 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
icu4j/src/com/ibm/icu/dev/tool/layout/LanguageData.java
View File

@ -6,7 +6,7 @@
*
* Created on Apr 4, 2003
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/LanguageData.java,v $ $Date: 2003/04/15 01:23:49 $ $Revision: 1.1 $
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/LanguageData.java,v $ $Date: 2003/04/15 20:15:53 $ $Revision: 1.2 $
*
*******************************************************************************
*/
@ -40,6 +40,16 @@ public class LanguageData
{
return name;
}
public String label()
{
return TagUtilities.tagLabel(tag);
}
public String makeTag()
{
return TagUtilities.makeTag(tag);
}
}
/*
@ -48,7 +58,7 @@ public class LanguageData
*/
private Record[] languages =
{
new Record("", "(Default)"),
new Record("", "null"),
new Record("ARA", "Arabic"),
new Record("ASM", "Assamese"),
new Record("BEN", "Bengali"),
@ -81,7 +91,7 @@ public class LanguageData
};
private int minLanguage = 0;
private int maxLanguage = languages.length - 1;
private int maxLanguage = minLanguage + languages.length - 1;
public int getMinLanguage()
{
@ -93,38 +103,38 @@ public class LanguageData
return maxLanguage;
}
public String getLanguageTag(int i)
public String getLanguageTag(int language)
{
if (i < minLanguage || i > maxLanguage) {
if (language < minLanguage || language > maxLanguage) {
return null;
}
return languages[i - minLanguage].tag();
return languages[language - minLanguage].tag();
}
public String getLanguageTagLabel(int i)
public String getLanguageTagLabel(int language)
{
if (i < minLanguage || i > maxLanguage) {
if (language < minLanguage || language > maxLanguage) {
return null;
}
return TagUtilities.tagLabel(languages[i - minLanguage].tag());
return languages[language - minLanguage].label();
}
public String makeLanguageTag(int i)
public String makeLanguageTag(int language)
{
if (i < minLanguage || i > maxLanguage) {
if (language < minLanguage || language > maxLanguage) {
return null;
}
return TagUtilities.makeTag(languages[i - minLanguage].tag());
return languages[language - minLanguage].makeTag();
}
public String getLanguageName(int i) {
if (i < minLanguage || i > maxLanguage) {
return "UNKNOWN";
public String getLanguageName(int language) {
if (language < minLanguage || language > maxLanguage) {
return "(UNKNOWN)";
}
return languages[i - minLanguage].name();
return languages[language - minLanguage].name();
}
}

8
icu4j/src/com/ibm/icu/dev/tool/layout/ModuleWriter.java
View File

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ModuleWriter.java,v $
* $Date: 2003/04/15 01:23:49 $
* $Revision: 1.2 $
* $Date: 2003/04/15 20:15:53 $
* $Revision: 1.3 $
*
*******************************************************************************
*/
@ -71,7 +71,9 @@ public class ModuleWriter
" * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS\n" +
" * YOU REALLY KNOW WHAT YOU'RE DOING.\n" +
" *\n" +
" * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ModuleWriter.java,v $ $Date: 2003/04/15 01:23:49 $ $Revision: 1.2 $\n" +
" * $Source" + "$\n" +
" * $Date" + "$\n" +
" * $Revision" + "$\n" +
" */\n" +
"\n";
}

5
icu4j/src/com/ibm/icu/dev/tool/layout/ScriptTagModuleWriter.java
View File

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptTagModuleWriter.java,v $
* $Date: 2003/04/15 01:23:49 $
* $Revision: 1.2 $
* $Date: 2003/04/15 20:15:53 $
* $Revision: 1.3 $
*
*******************************************************************************
*/
@ -142,7 +142,6 @@ public class ScriptTagModuleWriter extends ModuleWriter
private static final String hPostamble =
"\n" +
"const LETag nullLanguageTag = 0x00000000; /* '' (NONE) */\n" +
"\n" +
"U_NAMESPACE_END\n" +
"#endif";

4
icu4j/src/com/ibm/icu/dev/tool/layout/TagUtilities.java
View File

@ -6,7 +6,7 @@
*
* Created on Apr 14, 2003
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/TagUtilities.java,v $ $Date: 2003/04/15 01:23:49 $ $Revision: 1.1 $
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/TagUtilities.java,v $ $Date: 2003/04/15 20:15:53 $ $Revision: 1.2 $
*
*******************************************************************************
*/
@ -47,7 +47,7 @@ public class TagUtilities
public static String tagLabel(String tag)
{
if (tag == null || tag.length() == 0) {
return "default";
return "null";
} else {
return tag.toLowerCase();
}