diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js index 98101345b..185d57e49 100644 --- a/javascript/i18n/phonenumbers/metadata.js +++ b/javascript/i18n/phonenumbers/metadata.js @@ -28,7 +28,7 @@ goog.provide('i18n.phonenumbers.metadata'); * region represented by that country calling code. In the case of multiple * countries sharing a calling code, such as the NANPA regions, the one * indicated with "isMainCountryForCode" in the metadata should be first. - * @type {Object.>} + * @type {!Object.>} */ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = { 1:["US","AG","AI","AS","BB","BM","BS","CA","DM","DO","GD","GU","JM","KN","KY","LC","MP","MS","PR","SX","TC","TT","VC","VG","VI"] @@ -250,7 +250,7 @@ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = { /** * A mapping from a region code to the PhoneMetadata for that region. - * @type {Object.} + * @type {!Object.} */ i18n.phonenumbers.metadata.countryToMetadata = { "AC":[,[,,"[2-7]\\d{3,5}","\\d{4,6}"] diff --git a/javascript/i18n/phonenumbers/metadatafortesting.js b/javascript/i18n/phonenumbers/metadatafortesting.js index 6cdddbbbf..977f5589b 100644 --- a/javascript/i18n/phonenumbers/metadatafortesting.js +++ b/javascript/i18n/phonenumbers/metadatafortesting.js @@ -28,7 +28,7 @@ goog.provide('i18n.phonenumbers.metadata'); * region represented by that country calling code. In the case of multiple * countries sharing a calling code, such as the NANPA regions, the one * indicated with "isMainCountryForCode" in the metadata should be first. - * @type {Object.>} + * @type {!Object.>} */ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = { 1:["US","BB","BS","CA"] @@ -58,7 +58,7 @@ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = { /** * A mapping from a region code to the PhoneMetadata for that region. - * @type {Object.} + * @type {!Object.} */ i18n.phonenumbers.metadata.countryToMetadata = { "AD":[,[] diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js index 1164d8f29..7f9956ece 100644 --- a/javascript/i18n/phonenumbers/metadatalite.js +++ b/javascript/i18n/phonenumbers/metadatalite.js @@ -28,7 +28,7 @@ goog.provide('i18n.phonenumbers.metadata'); * region represented by that country calling code. In the case of multiple * countries sharing a calling code, such as the NANPA regions, the one * indicated with "isMainCountryForCode" in the metadata should be first. - * @type {Object.>} + * @type {!Object.>} */ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = { 1:["US","AG","AI","AS","BB","BM","BS","CA","DM","DO","GD","GU","JM","KN","KY","LC","MP","MS","PR","SX","TC","TT","VC","VG","VI"] @@ -250,7 +250,7 @@ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = { /** * A mapping from a region code to the PhoneMetadata for that region. - * @type {Object.} + * @type {!Object.} */ i18n.phonenumbers.metadata.countryToMetadata = { "AC":[,[,,"[2-7]\\d{3,5}","\\d{4,6}"] diff --git a/javascript/i18n/phonenumbers/phonenumberutil.js b/javascript/i18n/phonenumbers/phonenumberutil.js index 5287d9cea..264aecf3d 100644 --- a/javascript/i18n/phonenumbers/phonenumberutil.js +++ b/javascript/i18n/phonenumbers/phonenumberutil.js @@ -1271,8 +1271,7 @@ i18n.phonenumbers.PhoneNumberUtil.getCountryMobileToken = /** * Convenience method to get a list of what regions the library has metadata * for. - * - * @return {!Array} region codes supported by the library. + * @return {!Array.} region codes supported by the library. */ i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedRegions = function() { return goog.array.filter( @@ -1286,8 +1285,7 @@ i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedRegions = function() { /** * Convenience method to get a list of what global network calling codes the * library has metadata for. - * - * @return {!Array} global network calling codes supported by the + * @return {!Array.} global network calling codes supported by the * library. */ i18n.phonenumbers.PhoneNumberUtil.prototype. diff --git a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar index 0b156cc84..049b7c4fe 100644 Binary files a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar and b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar differ diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java index 35cb11a1b..2a264def9 100644 --- a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java +++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java @@ -63,13 +63,13 @@ public class BuildMetadataJsonFromXml extends Command { " * region represented by that country calling code. In the case of multiple\n" + " * countries sharing a calling code, such as the NANPA regions, the one\n" + " * indicated with \"isMainCountryForCode\" in the metadata should be first.\n" + - " * @type {Object.>}\n" + + " * @type {!Object.>}\n" + " */\n"; private static final String COUNTRY_TO_METADATA_COMMENT = "/**\n" + " * A mapping from a region code to the PhoneMetadata for that region.\n" + - " * @type {Object.}\n" + + " * @type {!Object.}\n" + " */\n"; private static final int COPYRIGHT_YEAR = 2010; diff --git a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar index ea8239146..b0999cd94 100644 Binary files a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar and b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar differ