diff --git a/java/build.xml b/java/build.xml index 63398b58f..7cbd41838 100644 --- a/java/build.xml +++ b/java/build.xml @@ -52,7 +52,6 @@ - @@ -63,15 +62,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -81,7 +106,6 @@ - @@ -125,7 +149,7 @@ - + diff --git a/java/pom.xml b/java/pom.xml index 2508cc1d5..975ec0562 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -245,7 +245,6 @@ GenerateAreaCodeData ../resources/geocoding src/com/google/i18n/phonenumbers/geocoding/data - false @@ -263,7 +262,6 @@ GenerateAreaCodeData ../resources/test/geocoding test/com/google/i18n/phonenumbers/geocoding/testing_data - true diff --git a/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java index e6bd36e6b..6e0668500 100644 --- a/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java +++ b/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java @@ -470,7 +470,7 @@ public class AsYouTypeFormatter { nationalNumber.setLength(0); nationalNumber.append(numberWithoutCountryCallingCode); String newRegionCode = phoneUtil.getRegionCodeForCountryCode(countryCode); - if (newRegionCode != defaultCountry) { + if (!newRegionCode.equals(defaultCountry)) { currentMetaData = getMetadataForRegion(newRegionCode); } String countryCodeString = Integer.toString(countryCode); diff --git a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java index 07fd3e9f9..b5d7ace5a 100644 --- a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java +++ b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Google Inc. + * Copyright (C) 2010 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index da57a138c..ca25c68eb 100644 --- a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -2346,7 +2346,7 @@ public class PhoneNumberUtil { * @param secondNumber second number to compare. Can contain formatting, and can have country * calling code specified with + at the start. * @return NOT_A_NUMBER, NO_MATCH, SHORT_NSN_MATCH, NSN_MATCH, EXACT_MATCH. See - * isNumberMatch(PhoneNumber firstNumber, PhoneNumber secondNumber) for more details. + * {@link #isNumberMatch(PhoneNumber, PhoneNumber)} for more details. */ public MatchType isNumberMatch(String firstNumber, String secondNumber) { try { @@ -2384,7 +2384,7 @@ public class PhoneNumberUtil { * @param secondNumber second number to compare. Can contain formatting, and can have country * calling code specified with + at the start. * @return NOT_A_NUMBER, NO_MATCH, SHORT_NSN_MATCH, NSN_MATCH, EXACT_MATCH. See - * isNumberMatch(PhoneNumber firstNumber, PhoneNumber secondNumber) for more details. + * {@link #isNumberMatch(PhoneNumber, PhoneNumber)} for more details. */ public MatchType isNumberMatch(PhoneNumber firstNumber, String secondNumber) { // First see if the second number has an implicit country calling code, by attempting to parse diff --git a/java/src/com/google/i18n/phonenumbers/RegexCache.java b/java/src/com/google/i18n/phonenumbers/RegexCache.java index f3e468458..9f3062006 100644 --- a/java/src/com/google/i18n/phonenumbers/RegexCache.java +++ b/java/src/com/google/i18n/phonenumbers/RegexCache.java @@ -46,7 +46,7 @@ public class RegexCache { return cache.containsKey(regex); } - private class LRUCache { + private static class LRUCache { // LinkedHashMap offers a straightforward implementation of LRU cache. private LinkedHashMap map; private int size; diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java b/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java index 8b746e39d..9e1c85f29 100644 --- a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java +++ b/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java @@ -185,7 +185,7 @@ public class AreaCodeMap implements Externalizable { private int binarySearch(int start, int end, long value) { int current = 0; while (start <= end) { - current = (start + end) / 2; + current = (start + end) >>> 1; int currentValue = areaCodeMapStorage.getPrefix(current); if (currentValue == value) { return current; diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java b/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java index 65fb2bd9f..0b5f85fad 100644 --- a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java +++ b/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java @@ -40,7 +40,7 @@ abstract class AreaCodeMapStorageStrategy { * * @param countryCallingCode the country calling code of the number prefixes contained in the map * @param isLeadingZeroPossible whether the phone number prefixes belong to a region which - * {@link PhoneNumberUtil#isLeadingZeroPossible isLeadingZeroPossible} + * {@link com.google.i18n.phonenumbers.PhoneNumberUtil#isLeadingZeroPossible} */ public AreaCodeMapStorageStrategy(int countryCallingCode, boolean isLeadingZeroPossible) { this.countryCallingCode = countryCallingCode; diff --git a/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java b/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java index 45d352b10..7bc71e727 100644 --- a/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java +++ b/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Google Inc. + * Copyright (C) 2010 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java b/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java index 1f4d5fb66..451ba5ec6 100644 --- a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java +++ b/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java @@ -702,7 +702,7 @@ public class PhoneNumberMatcherTest extends TestCase { * Small class that holds the context of the number we are testing against. The test will * insert the phone number to be found between leadingText and trailingText. */ - private class NumberContext { + private static class NumberContext { final String leadingText; final String trailingText; diff --git a/javascript/README b/javascript/README index bd86732cb..79b52d61d 100644 --- a/javascript/README +++ b/javascript/README @@ -33,26 +33,17 @@ project: have changed: a. Manually update the .pb.js files with the changes of the .proto files. b. Manually update the toJsArray() Java methods in - java/resources/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java + tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataJsonFromXml.java + c. Build tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar + by running: + mvn -f tools/java/java-build/pom.xml package 2. If the phone number metadata in the XML format has changed (resources/PhoneNumberMetaData.xml) run the following commands to regenerate metadata.js and metadatafortesting.js: - ant -f java/build.xml - java -cp java/build/classes \ - com.google.i18n.phonenumbers.BuildMetadataJsonFromXml \ - resources/PhoneNumberMetaData.xml \ - javascript/i18n/phonenumbers/metadata.js false - java -cp java/build/classes \ - com.google.i18n.phonenumbers.BuildMetadataJsonFromXml \ - resources/PhoneNumberMetaData.xml \ - javascript/i18n/phonenumbers/metadatalite.js true - java -cp java/build/classes \ - com.google.i18n.phonenumbers.BuildMetadataJsonFromXml \ - resources/PhoneNumberMetaDataForTesting.xml \ - javascript/i18n/phonenumbers/metadatafortesting.js false + ant -f java/build.xml build-js-metadata 3. Manually port any changes of the Java code to the JavaScript code: PhoneNumberUtil.java => phonenumberutil.js diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js index c93dee1bd..575094b8c 100644 --- a/javascript/i18n/phonenumbers/metadata.js +++ b/javascript/i18n/phonenumbers/metadata.js @@ -2315,9 +2315,9 @@ i18n.phonenumbers.metadata.countryToMetadata = { ,[,,"NA","NA"] ,[,,"NA","NA"] ,"KW",965,"00",,,,,,,,[[,"(\\d{4})(\\d{3,4})","$1 $2",["[1269]"] -,"",""] +,"$1",""] ,[,"(5[05]\\d)(\\d{5})","$1 $2",["5"] -,"",""] +,"$1",""] ] ,,[,,"NA","NA"] ,,,[,,"NA","NA"] diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js index 092e7d893..ba5affccb 100644 --- a/javascript/i18n/phonenumbers/metadatalite.js +++ b/javascript/i18n/phonenumbers/metadatalite.js @@ -2315,9 +2315,9 @@ i18n.phonenumbers.metadata.countryToMetadata = { ,[,,"NA","NA"] ,[,,"NA","NA"] ,"KW",965,"00",,,,,,,,[[,"(\\d{4})(\\d{3,4})","$1 $2",["[1269]"] -,"",""] +,"$1",""] ,[,"(5[05]\\d)(\\d{5})","$1 $2",["5"] -,"",""] +,"$1",""] ] ,,[,,"NA","NA"] ,,,[,,"NA","NA"] diff --git a/tools/java/common/pom.xml b/tools/java/common/pom.xml index 00bdb45aa..b91b96f4a 100644 --- a/tools/java/common/pom.xml +++ b/tools/java/common/pom.xml @@ -27,26 +27,8 @@ 1.5 - - - org.apache.maven.plugins - maven-antrun-plugin - - - create-generated-directory - generate-sources - - - - - - - run - - - - - + org.codehaus.mojo build-helper-maven-plugin @@ -60,34 +42,12 @@ - generated/ + ../../../java/src/ - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - - generate-sources - - exec - - - - - protoc - - --java_out=generated - ../../../resources/phonemetadata.proto - --proto_path=../../../resources - - - @@ -98,11 +58,6 @@ 4.8.1 test - - com.google.protobuf - protobuf-java - 2.4.0a - diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/tools/BuildMetadataFromXml.java b/tools/java/common/src/com/google/i18n/phonenumbers/tools/BuildMetadataFromXml.java index 798668926..0399b0117 100644 --- a/tools/java/common/src/com/google/i18n/phonenumbers/tools/BuildMetadataFromXml.java +++ b/tools/java/common/src/com/google/i18n/phonenumbers/tools/BuildMetadataFromXml.java @@ -32,7 +32,6 @@ import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.logging.Logger; import java.util.regex.Pattern; import javax.xml.parsers.DocumentBuilder; diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/tools/CopyrightNotice.java b/tools/java/common/src/com/google/i18n/phonenumbers/tools/CopyrightNotice.java index a89f1ff9b..b98f88e40 100644 --- a/tools/java/common/src/com/google/i18n/phonenumbers/tools/CopyrightNotice.java +++ b/tools/java/common/src/com/google/i18n/phonenumbers/tools/CopyrightNotice.java @@ -16,7 +16,9 @@ package com.google.i18n.phonenumbers.tools; -import java.util.Calendar; +import java.io.IOException; +import java.io.Writer; +import java.util.Formatter; /** * Class containing the Apache copyright notice used by code generators. @@ -25,9 +27,15 @@ import java.util.Calendar; */ public class CopyrightNotice { - public static final String TEXT = - "/*\n" + - " * Copyright (C) " + Calendar.getInstance().get(Calendar.YEAR) + " Google Inc.\n" + + private static final String TEXT_OPENING = + "/*\n"; + + private static final String TEXT_OPENING_FOR_JAVASCRIPT = + "/**\n" + + " * @license\n"; + + private static final String TEXT = + " * Copyright (C) %d Google Inc.\n" + " *\n" + " * Licensed under the Apache License, Version 2.0 (the \"License\");\n" + " * you may not use this file except in compliance with the License.\n" + @@ -40,5 +48,19 @@ public class CopyrightNotice { " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" + " * See the License for the specific language governing permissions and\n" + " * limitations under the License.\n" + - " */\n"; + " */\n\n"; + + static final void writeTo(Writer writer, int year) throws IOException { + writeTo(writer, year, false); + } + + static final void writeTo(Writer writer, int year, boolean isJavascript) throws IOException { + if (isJavascript) { + writer.write(TEXT_OPENING_FOR_JAVASCRIPT); + } else { + writer.write(TEXT_OPENING); + } + Formatter formatter = new Formatter(writer); + formatter.format(TEXT, year); + } } diff --git a/tools/java/common/test/com/google/i18n/phonenumbers/tools/BuildMetadataFromXmlTest.java b/tools/java/common/test/com/google/i18n/phonenumbers/tools/BuildMetadataFromXmlTest.java index 03d04924a..e6059a46b 100644 --- a/tools/java/common/test/com/google/i18n/phonenumbers/tools/BuildMetadataFromXmlTest.java +++ b/tools/java/common/test/com/google/i18n/phonenumbers/tools/BuildMetadataFromXmlTest.java @@ -18,7 +18,6 @@ package com.google.i18n.phonenumbers.tools; import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import junit.framework.TestCase; @@ -115,7 +114,7 @@ public class BuildMetadataFromXmlTest extends TestCase { assertEquals("0", phoneMetadata.getNationalPrefix()); assertEquals(" x", phoneMetadata.getPreferredExtnPrefix()); assertTrue(phoneMetadata.getMainCountryForCode()); - assertTrue(phoneMetadata.getLeadingZeroPossible()); + assertTrue(phoneMetadata.isLeadingZeroPossible()); } public void testLoadTerritoryTagMetadataSetsBooleanFieldsToFalseByDefault() @@ -125,7 +124,7 @@ public class BuildMetadataFromXmlTest extends TestCase { PhoneMetadata.Builder phoneMetadata = BuildMetadataFromXml.loadTerritoryTagMetadata("33", territoryElement, "", ""); assertFalse(phoneMetadata.getMainCountryForCode()); - assertFalse(phoneMetadata.getLeadingZeroPossible()); + assertFalse(phoneMetadata.isLeadingZeroPossible()); } public void testLoadTerritoryTagMetadataSetsNationalPrefixForParsingByDefault() @@ -144,8 +143,7 @@ public class BuildMetadataFromXmlTest extends TestCase { String xmlInput = ""; Element territoryElement = parseXmlString(xmlInput); // Should not throw any exception. - PhoneMetadata.Builder phoneMetadata = - BuildMetadataFromXml.loadTerritoryTagMetadata("33", territoryElement, "", ""); + BuildMetadataFromXml.loadTerritoryTagMetadata("33", territoryElement, "", ""); } // Tests loadInternationalFormat(). @@ -310,7 +308,7 @@ public class BuildMetadataFromXmlTest extends TestCase { Element element = parseXmlString(xmlInput); PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder(); BuildMetadataFromXml.loadAvailableFormats(metadata, "AE", element, "0", "($1)"); - assertEquals(0, metadata.getIntlNumberFormatCount()); + assertEquals(0, metadata.intlNumberFormatSize()); } public void testLoadAvailableFormatsHandlesMultipleNumberFormats() @@ -337,7 +335,7 @@ public class BuildMetadataFromXmlTest extends TestCase { String nationalFormat = "$1 $2"; BuildMetadataFromXml.loadInternationalFormat(metadata, numberFormatElement, nationalFormat); - assertEquals(0, metadata.getIntlNumberFormatCount()); + assertEquals(0, metadata.intlNumberFormatSize()); } // Tests setLeadingDigitsPatterns(). @@ -484,7 +482,7 @@ public class BuildMetadataFromXmlTest extends TestCase { PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder(); // Should set sameMobileAndFixedPattern to true. BuildMetadataFromXml.loadGeneralDesc(metadata, territoryElement); - assertTrue(metadata.getSameMobileAndFixedLinePattern()); + assertTrue(metadata.isSameMobileAndFixedLinePattern()); } public void testLoadGeneralDescSetsAllDescriptions() diff --git a/tools/java/cpp-build/pom.xml b/tools/java/cpp-build/pom.xml index a4a310595..b271dcbac 100644 --- a/tools/java/cpp-build/pom.xml +++ b/tools/java/cpp-build/pom.xml @@ -72,7 +72,7 @@ - + org.codehaus.mojo exec-maven-plugin diff --git a/tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXml.java b/tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXml.java index d7fcd8249..7b631ffb9 100644 --- a/tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXml.java +++ b/tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXml.java @@ -53,6 +53,8 @@ public class BuildMetadataCppFromXml extends Command { private static final Set METADATA_TYPES = new HashSet(Arrays.asList("metadata", "test_metadata", "lite_metadata")); + private static final int COPYRIGHT_YEAR = 2011; + /** * Package private setter used to inject the binary stream for testing purpose. */ @@ -124,9 +126,9 @@ public class BuildMetadataCppFromXml extends Command { * const void* metadata_get(); * */ - private void emitHeader() { + private void emitHeader() throws IOException { final PrintWriter pw = new PrintWriter(headerFileOutputStream); - pw.write(CopyrightNotice.TEXT); + CopyrightNotice.writeTo(pw, COPYRIGHT_YEAR); final String guardName = "I18N_PHONENUMBERS_METADATA_H_"; pw.println("#ifndef " + guardName); pw.println("#define " + guardName); @@ -179,7 +181,7 @@ public class BuildMetadataCppFromXml extends Command { */ private void emitImplementation() throws IOException { final PrintWriter pw = new PrintWriter(implFileOutputStream); - pw.write(CopyrightNotice.TEXT); + CopyrightNotice.writeTo(pw, COPYRIGHT_YEAR); pw.println("#include \"phonenumbers/metadata.h\""); pw.println(); 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 f042be740..c727b9960 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/pom.xml b/tools/java/java-build/pom.xml index 571256a25..6ce4268f4 100644 --- a/tools/java/java-build/pom.xml +++ b/tools/java/java-build/pom.xml @@ -49,7 +49,7 @@ 1.5 - org.codehaus.mojo diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataJsonFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataJsonFromXml.java index c1e72eb67..c6f7adecf 100644 --- a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataJsonFromXml.java +++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataJsonFromXml.java @@ -72,6 +72,8 @@ public class BuildMetadataJsonFromXml extends Command { " * @type {Object.}\n" + " */\n"; + private static final int COPYRIGHT_YEAR = 2010; + @Override public String getCommandName() { return "BuildMetadataJsonFromXml"; @@ -97,7 +99,7 @@ public class BuildMetadataJsonFromXml extends Command { BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile)); - writer.write(CopyrightNotice.TEXT); + CopyrightNotice.writeTo(writer, COPYRIGHT_YEAR, true); Formatter formatter = new Formatter(writer); formatter.format(FILE_OVERVIEW, inputFile); @@ -116,7 +118,7 @@ public class BuildMetadataJsonFromXml extends Command { writer.flush(); writer.close(); } catch (Exception e) { - System.err.println(HELP_MESSAGE); + e.printStackTrace(); return false; } return true; diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataProtoFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataProtoFromXml.java index 5d2332cc4..5d30d6970 100644 --- a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataProtoFromXml.java +++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataProtoFromXml.java @@ -20,7 +20,6 @@ import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; import java.io.BufferedWriter; -import java.io.File; import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; @@ -71,7 +70,7 @@ public class BuildMetadataProtoFromXml extends Command { private static final String GENERATION_COMMENT = "/* This file is automatically generated by {@link BuildMetadataProtoFromXml}.\n" + " * Please don't modify it directly.\n" + - " */\n"; + " */\n\n"; @Override public String getCommandName() { @@ -116,7 +115,7 @@ public class BuildMetadataProtoFromXml extends Command { writeCountryCallingCodeMappingToJavaFile(countryCodeToRegionCodeMap, outputDir, forTesting); } catch (Exception e) { - System.err.println(HELP_MESSAGE); + e.printStackTrace(); return false; } System.out.println("Metadata code successfully generated."); @@ -137,6 +136,7 @@ public class BuildMetadataProtoFromXml extends Command { private static final String MAPPING_COMMENT_2 = " // The capacity is set to %d as there are %d different country codes,\n" + " // and this offers a load factor of roughly " + MAPPING_LOAD_FACTOR + ".\n"; + private static final int COPYRIGHT_YEAR = 2010; private static void writeCountryCallingCodeMappingToJavaFile( Map> countryCodeToRegionCodeMap, @@ -152,7 +152,8 @@ public class BuildMetadataProtoFromXml extends Command { BufferedWriter writer = new BufferedWriter(new FileWriter(mappingFile)); - writer.write(CopyrightNotice.TEXT + "\n" + GENERATION_COMMENT + "\n"); + CopyrightNotice.writeTo(writer, COPYRIGHT_YEAR); + writer.write(GENERATION_COMMENT); if (PACKAGE_NAME.length() > 0) { writer.write("package " + PACKAGE_NAME.replaceAll("/", ".") + ";\n\n"); } diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/GenerateAreaCodeData.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/GenerateAreaCodeData.java index 5c0c66352..a5effcf11 100644 --- a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/GenerateAreaCodeData.java +++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/GenerateAreaCodeData.java @@ -57,8 +57,6 @@ public class GenerateAreaCodeData extends Command { private final File inputPath; // The path to the output directory. private final File outputPath; - // Whether the data is generated for testing. - private final boolean forTesting; private static final Logger LOGGER = Logger.getLogger(GenerateAreaCodeData.class.getName()); @@ -68,10 +66,9 @@ public class GenerateAreaCodeData extends Command { public GenerateAreaCodeData() { inputPath = null; outputPath = null; - forTesting = false; } - public GenerateAreaCodeData(File inputPath, File outputPath, boolean forTesting) + public GenerateAreaCodeData(File inputPath, File outputPath) throws IOException { if (!inputPath.isDirectory()) { throw new IOException("The provided input path does not exist: " + @@ -88,7 +85,6 @@ public class GenerateAreaCodeData extends Command { } this.inputPath = inputPath; this.outputPath = outputPath; - this.forTesting = forTesting; } /** @@ -146,7 +142,7 @@ public class GenerateAreaCodeData extends Command { objectOutputStream.flush(); } - private class Pair { + private static class Pair { public final A first; public final B second; @@ -284,16 +280,14 @@ public class GenerateAreaCodeData extends Command { public boolean start() { String[] args = getArgs(); - if (args.length != 4) { + if (args.length != 3) { LOGGER.log(Level.SEVERE, - "usage: GenerateAreaCodeData /path/to/input/directory /path/to/output/directory" + - " forTesting"); + "usage: GenerateAreaCodeData /path/to/input/directory /path/to/output/directory"); return false; } try { GenerateAreaCodeData generateAreaCodeData = - new GenerateAreaCodeData(new File(args[1]), new File(args[2]), - Boolean.parseBoolean(args[3])); + new GenerateAreaCodeData(new File(args[1]), new File(args[2])); generateAreaCodeData.run(); } catch (IOException e) { LOGGER.log(Level.SEVERE, e.getMessage()); 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 b66b4a354..0e38e71f4 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