organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-10399 Some updates for the eclipse plug-in version. Resolve some compiler warnings, updated the build version.

Browse source 
X-SVN-Rev: 34456
This commit is contained in:
Yoshito Umaoka 2013-09-23 18:14:29 +00:00
parent 34abbe1c7f
commit 3a41fdc007
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4j/eclipse-build/build.properties
View file

@ -2,6 +2,6 @@
#* Copyright (C) 2010-2013, International Business Machines Corporation and *
#* others. All Rights Reserved. *
#*******************************************************************************
icu4j.plugin.impl.version.string=52.0.1
icu4j.plugin.impl.version.string=52.1.0
copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2013. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
icu4j.data.version.number=52

3
icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneGenericNames.java
View file

@ -797,8 +797,9 @@ public class TimeZoneGenericNames implements Serializable, Freezable<TimeZoneGen
case SHORT_GENERIC:
nameType = GenericNameType.SHORT;
break;
default:
throw new IllegalArgumentException("Unexpected MatchInfo name type - " + matchInfo.nameType());
}
assert(nameType != null);
String tzID = matchInfo.tzID();
if (tzID == null) {

14
icu4j/main/classes/core/src/com/ibm/icu/text/TimeZoneFormat.java
View file

@ -951,6 +951,12 @@ public class TimeZoneFormat extends UFormat implements Freezable<TimeZoneFormat>
case ISO_EXTENDED_LOCAL_FULL:
result = formatOffsetISO8601Extended(offset, false, false, false);
break;
default:
// Other cases are handled earlier and never comes into this
// switch statement.
assert false;
break;
}
// time type
if (timeType != null) {
@ -1189,6 +1195,10 @@ public class TimeZoneFormat extends UFormat implements Freezable<TimeZoneFormat>
case GENERIC_SHORT:
genericNameTypes = EnumSet.of(GenericNameType.SHORT, GenericNameType.LOCATION);
break;
default:
// style cannot be other than above cases
assert false;
break;
}
GenericMatchInfo bestGeneric = getTimeZoneGenericNames().findBestMatch(text, startIdx, genericNameTypes);
if (bestGeneric != null && (startIdx + bestGeneric.matchLength() > parsedPos)) {
@ -1787,8 +1797,10 @@ public class TimeZoneFormat extends UFormat implements Freezable<TimeZoneFormat>
case LONG_DAYLIGHT:
case SHORT_DAYLIGHT:
return TimeType.DAYLIGHT;
default:
return TimeType.UNKNOWN;
}
return TimeType.UNKNOWN;
}
/**