JAVA/DATA/TOOLS: Adding some short number metadata separately, and adjusting the build tools to handle this.

java/build.xml

@@ -41,6 +41,20 @@
     </exec>
   </target>
 
+  <target name="build-short-metadata">
+    <exec executable="java">
+      <arg value="-jar" />
+      <arg value="${build.tools.jar}"/>
+      <arg value="BuildMetadataProtoFromXml"/>
+      <arg value="--input-file=${resources.dir}/ShortNumberMetadata.xml"/>
+      <arg value="--output-dir=${libphonenumber.src.dir}/com/google/i18n/phonenumbers"/>
+      <arg value="--data-prefix=data/ShortNumberMetadataProto"/>
+      <arg value="--mapping-class=ShortNumbersRegionCodeSet"/>
+      <arg value="--copyright=2013"/>
+      <arg value="--lite-build=false"/>
+    </exec>
+  </target>
+
   <target name="build-test-metadata">
     <exec executable="java">
       <arg value="-jar" />

java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2013 The Libphonenumber Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* This file is automatically generated by {@link BuildMetadataProtoFromXml}.
+ * Please don't modify it directly.
+ */
+
+package com.google.i18n.phonenumbers;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class ShortNumbersRegionCodeSet {
+  // A set of all region codes for which data is available.
+  static Set<String> getRegionCodeSet() {
+    // The capacity is set to 1 as there are 50 different entries,
+    // and this offers a load factor of roughly 0.75.
+    Set<String> regionCodeSet = new HashSet<String>(1);
+
+    regionCodeSet.add("AM");
+    regionCodeSet.add("AR");
+    regionCodeSet.add("BD");
+    regionCodeSet.add("CH");
+    regionCodeSet.add("CR");
+    regionCodeSet.add("CU");
+    regionCodeSet.add("CZ");
+    regionCodeSet.add("DE");
+    regionCodeSet.add("EE");
+    regionCodeSet.add("FR");
+    regionCodeSet.add("FJ");
+    regionCodeSet.add("FK");
+    regionCodeSet.add("FO");
+    regionCodeSet.add("GB");
+    regionCodeSet.add("GG");
+    regionCodeSet.add("GI");
+    regionCodeSet.add("GT");
+    regionCodeSet.add("GY");
+    regionCodeSet.add("HT");
+    regionCodeSet.add("IL");
+    regionCodeSet.add("IM");
+    regionCodeSet.add("IT");
+    regionCodeSet.add("JE");
+    regionCodeSet.add("JO");
+    regionCodeSet.add("KE");
+    regionCodeSet.add("KI");
+    regionCodeSet.add("KW");
+    regionCodeSet.add("LI");
+    regionCodeSet.add("LU");
+    regionCodeSet.add("MD");
+    regionCodeSet.add("ME");
+    regionCodeSet.add("MU");
+    regionCodeSet.add("MV");
+    regionCodeSet.add("MZ");
+    regionCodeSet.add("NA");
+    regionCodeSet.add("NC");
+    regionCodeSet.add("NL");
+    regionCodeSet.add("NR");
+    regionCodeSet.add("PA");
+    regionCodeSet.add("PY");
+    regionCodeSet.add("QA");
+    regionCodeSet.add("RS");
+    regionCodeSet.add("SA");
+    regionCodeSet.add("SB");
+    regionCodeSet.add("SC");
+    regionCodeSet.add("SG");
+    regionCodeSet.add("SH");
+    regionCodeSet.add("SR");
+    regionCodeSet.add("TL");
+    regionCodeSet.add("UY");
+
+    return regionCodeSet;
+  }
+}

tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java

@@ -166,7 +166,9 @@ public class BuildMetadataFromXml {
                                                         String nationalPrefix) {
     PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder();
     metadata.setId(regionCode);
-    metadata.setCountryCode(Integer.parseInt(element.getAttribute(COUNTRY_CODE)));
+    if (element.hasAttribute(COUNTRY_CODE)) {
+      metadata.setCountryCode(Integer.parseInt(element.getAttribute(COUNTRY_CODE)));
+    }
     if (element.hasAttribute(LEADING_DIGITS)) {
       metadata.setLeadingDigits(validateRE(element.getAttribute(LEADING_DIGITS)));
     }

tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java

@@ -177,11 +177,13 @@ public class BuildMetadataProtoFromXml extends Command {
       "  // country/region represented by that country code. In the case of multiple\n" +
       "  // countries sharing a calling code, such as the NANPA countries, the one\n" +
       "  // indicated with \"isMainCountryForCode\" in the metadata should be first.\n";
-  private static final String SET_COMMENT =
+  private static final String COUNTRY_CODE_SET_COMMENT =
       "  // A set of all country codes for which data is available.\n";
+  private static final String REGION_CODE_SET_COMMENT =
+      "  // A set of all region codes for which data is available.\n";
   private static final double CAPACITY_FACTOR = 0.75;
   private static final String CAPACITY_COMMENT =
-      "    // The capacity is set to %d as there are %d different country codes,\n" +
+      "    // The capacity is set to %d as there are %d different entries,\n" +
       "    // and this offers a load factor of roughly " + CAPACITY_FACTOR + ".\n";
 
   private static void writeCountryCallingCodeMappingToJavaFile(
@@ -197,13 +199,16 @@ public class BuildMetadataProtoFromXml extends Command {
         break;
       }
     }
+    boolean hasCountryCodes = countryCodeToRegionCodeMap.size() > 1;
 
     ClassWriter writer = new ClassWriter(outputDir, mappingClass, copyright);
 
-    if (hasRegionCodes) {
+    if (hasRegionCodes && hasCountryCodes) {
       writeMap(writer, capacity, countryCodeToRegionCodeMap);
+    } else if (hasCountryCodes) {
+      writeCountryCodeSet(writer, capacity, countryCodeToRegionCodeMap.keySet());
     } else {
-      writeSet(writer, capacity, countryCodeToRegionCodeMap.keySet());
+      writeRegionCodeSet(writer, capacity, countryCodeToRegionCodeMap.get(0));
     }
 
     writer.writeToFile();
@@ -243,9 +248,30 @@ public class BuildMetadataProtoFromXml extends Command {
     writer.addToBody("  }\n");
   }
 
-  private static void writeSet(ClassWriter writer, int capacity,
-                               Set<Integer> countryCodeSet) {
-    writer.addToBody(SET_COMMENT);
+  private static void writeRegionCodeSet(ClassWriter writer, int capacity,
+                                         List<String> regionCodeSet) {
+    writer.addToBody(REGION_CODE_SET_COMMENT);
+
+    writer.addToImports("java.util.HashSet");
+    writer.addToImports("java.util.Set");
+
+    writer.addToBody("  static Set<String> getRegionCodeSet() {\n");
+    writer.formatToBody(CAPACITY_COMMENT, capacity, regionCodeSet.size());
+    writer.addToBody("    Set<String> regionCodeSet = new HashSet<String>(" + capacity + ");\n");
+    writer.addToBody("\n");
+
+    for (String regionCode : regionCodeSet) {
+      writer.addToBody("    regionCodeSet.add(\"" + regionCode + "\");\n");
+    }
+
+    writer.addToBody("\n");
+    writer.addToBody("    return regionCodeSet;\n");
+    writer.addToBody("  }\n");
+  }
+
+  private static void writeCountryCodeSet(ClassWriter writer, int capacity,
+                                          Set<Integer> countryCodeSet) {
+    writer.addToBody(COUNTRY_CODE_SET_COMMENT);
 
     writer.addToImports("java.util.HashSet");
     writer.addToImports("java.util.Set");