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

ICU-11572 review updates

Browse Source 
X-SVN-Rev: 37982
This commit is contained in:
Scott Russell 2015-09-22 04:17:27 +00:00
parent fdd235d5e5
commit f57dc2ac03
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
icu4j/main/classes/core/src/com/ibm/icu/text/DateFormat.java
View File

@ -502,7 +502,12 @@ public abstract class DateFormat extends UFormat {
* @provisional This API might change or be removed in a future release.
*/
PARSE_PARTIAL_LITERAL_MATCH,
// old name left in for previous serialization checks
/**
* alias of PARSE_PARTIAL_LITERAL_MATCH
* @internal
* @deprecated
*/
@Deprecated
PARSE_PARTIAL_MATCH
};
@ -1589,6 +1594,9 @@ public abstract class DateFormat extends UFormat {
*/
public DateFormat setBooleanAttribute(BooleanAttribute key, boolean value)
{
if(key.equals(DateFormat.BooleanAttribute.PARSE_PARTIAL_MATCH)) {
key = DateFormat.BooleanAttribute.PARSE_PARTIAL_LITERAL_MATCH;
}
if(value)
{
booleanAttributes.add(key);
@ -1611,6 +1619,9 @@ public abstract class DateFormat extends UFormat {
*/
public boolean getBooleanAttribute(BooleanAttribute key)
{
if(key == DateFormat.BooleanAttribute.PARSE_PARTIAL_MATCH) {
key = DateFormat.BooleanAttribute.PARSE_PARTIAL_LITERAL_MATCH;
}
return booleanAttributes.contains(key);
}
@ -1740,6 +1751,12 @@ public abstract class DateFormat extends UFormat {
// Didn't have capitalizationSetting, set it to default
capitalizationSetting = DisplayContext.CAPITALIZATION_NONE;
}
// if deserialized from a release that didn't have booleanAttributes, add them all
if(booleanAttributes == null) {
booleanAttributes = EnumSet.allOf(BooleanAttribute.class);
}
serialVersionOnStream = currentSerialVersion;
}

5
icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java
View File

@ -3681,6 +3681,11 @@ public class SimpleDateFormat extends DateFormat {
}
}
}
// if serialized pre-56 update & turned off partial match switch to new enum value
if(getBooleanAttribute(DateFormat.BooleanAttribute.PARSE_PARTIAL_MATCH) == false) {
setBooleanAttribute(DateFormat.BooleanAttribute.PARSE_PARTIAL_LITERAL_MATCH, false);
}
}
/**