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

ICU-6726 Fixed test failures for 4.2M4.

Browse Source 
X-SVN-Rev: 25604
This commit is contained in:
Yoshito Umaoka 2009-03-17 04:39:48 +00:00
parent 1cc33502bb
commit cb92a45f2a
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4j/src/com/ibm/icu/impl/RelativeDateFormat.java
View File

@ -228,19 +228,19 @@ public class RelativeDateFormat extends DateFormat {
{ {
case DateFormat.RELATIVE_FULL: case DateFormat.RELATIVE_FULL:
case DateFormat.FULL: case DateFormat.FULL:
glueIndex = DateFormat.FULL + 1; //glueIndex += DateFormat.FULL;
break; break;
case DateFormat.RELATIVE_LONG: case DateFormat.RELATIVE_LONG:
case DateFormat.LONG: case DateFormat.LONG:
glueIndex = DateFormat.LONG + 1; glueIndex += DateFormat.LONG;
break; break;
case DateFormat.RELATIVE_MEDIUM: case DateFormat.RELATIVE_MEDIUM:
case DateFormat.MEDIUM: case DateFormat.MEDIUM:
glueIndex = DateFormat.MEDIUM + 1; glueIndex += DateFormat.MEDIUM;
break; break;
case DateFormat.RELATIVE_SHORT: case DateFormat.RELATIVE_SHORT:
case DateFormat.SHORT: case DateFormat.SHORT:
glueIndex = DateFormat.SHORT + 1; glueIndex += DateFormat.SHORT;
break; break;
default: default:
break; break;

2
icu4j/src/com/ibm/icu/text/SimpleDateFormat.java
View File

@ -543,7 +543,7 @@ public class SimpleDateFormat extends DateFormat {
int glueIndex = 8; int glueIndex = 8;
if (dateTimePatterns.length > 9) if (dateTimePatterns.length > 9)
{ {
glueIndex += SHORT + 1; glueIndex += SHORT;
} }
cachedDefaultPattern = MessageFormat.format(dateTimePatterns[glueIndex], cachedDefaultPattern = MessageFormat.format(dateTimePatterns[glueIndex],
new Object[] {dateTimePatterns[SHORT], dateTimePatterns[SHORT + 4]}); new Object[] {dateTimePatterns[SHORT], dateTimePatterns[SHORT + 4]});

3
icu4j/src/com/ibm/icu/util/Calendar.java
View File

@ -3185,7 +3185,6 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable {
"{1} {0}", "{1} {0}",
"{1} {0}", "{1} {0}",
"{1} {0}", "{1} {0}",
"{1} {0}",
"{1} {0}" "{1} {0}"
}; };
@ -3213,7 +3212,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable {
int glueIndex = 8; int glueIndex = 8;
if (patterns.length > 9) if (patterns.length > 9)
{ {
glueIndex += dateStyle + 1; glueIndex += dateStyle;
} }
pattern = MessageFormat.format(patterns[glueIndex], pattern = MessageFormat.format(patterns[glueIndex],
new Object[] {patterns[timeStyle], patterns[dateStyle + 4]}); new Object[] {patterns[timeStyle], patterns[dateStyle + 4]});