JAVA: Updated the geocoder

java/build.xml

@@ -5,6 +5,8 @@
   <property name="libphonenumber.test.dir" value="libphonenumber/test"/>
   <property name="geocoder.src.dir" value="geocoder/src"/>
   <property name="geocoder.test.dir" value="geocoder/test"/>
+  <property name="prefixmapper.src.dir" value="internal/prefixmapper/src"/>
+  <property name="prefixmapper.test.dir" value="internal/prefixmapper/test"/>
   <property name="build.dir" value="build"/>
   <property name="classes.dir" value="${build.dir}/classes"/>
   <property name="jar.dir" value="${build.dir}/jar"/>
@@ -131,9 +133,9 @@
   <target name="compile" description="Compile Java source."
           depends="build-phone-metadata,build-short-metadata,build-alternate-metadata,build-geo-data">
     <mkdir dir="${classes.dir}"/>
-    <javac srcdir="${libphonenumber.src.dir};${geocoder.src.dir}"
+    <javac srcdir="${libphonenumber.src.dir};${geocoder.src.dir};${prefixmapper.src.dir}"
            destdir="${classes.dir}" classpathref="classpath" includeAntRuntime="false"/>
-    <javac srcdir="${libphonenumber.test.dir};${geocoder.test.dir}"
+    <javac srcdir="${libphonenumber.test.dir};${geocoder.test.dir};${prefixmapper.test.dir}"
            destdir="${classes.dir}" classpathref="classpath" debug="on"
            includeAntRuntime="false"/>
   </target>
@@ -146,6 +148,7 @@
         <exclude name="**/*Test*"/>
         <exclude name="**/BuildMetadata*"/>
         <exclude name="**/geocoding/*"/>
+        <exclude name="**/prefixmapper/*"/>
       </fileset>
       <fileset dir="${libphonenumber.src.dir}">
         <include name="**/PhoneNumberMetadataProto*"/>
@@ -156,6 +159,7 @@
     <jar destfile="${jar.dir}/offline-geocoder.jar">
       <fileset dir="${classes.dir}">
         <include name="**/geocoding/*.class"/>
+        <include name="**/prefixmapper/*.class"/>
         <exclude name="**/*Test*"/>
         <exclude name="**/geocoding/GenerateAreaCodeData*"/>
       </fileset>
@@ -199,6 +203,9 @@
       <batchtest fork="no" todir="${report.dir}">
         <fileset dir="${geocoder.test.dir}" includes="**/*Test.java"/>
       </batchtest>
+      <batchtest fork="no" todir="${report.dir}">
+        <fileset dir="${prefixmapper.test.dir}" includes="**/*Test.java"/>
+      </batchtest>
     </junit>
     <fail message="Tests failed. Run 'ant junitreport' for more info."
         if="test.failed"/>

java/geocoder/pom.xml

@@ -36,6 +36,11 @@
       <artifactId>libphonenumber</artifactId>
       <version>5.9-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>com.googlecode.libphonenumber</groupId>
+      <artifactId>prefixmapper</artifactId>
+      <version>2.10-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 
 </project>

java/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java

@@ -19,7 +19,7 @@ package com.google.i18n.phonenumbers.geocoding;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType;
 import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
-import com.google.i18n.phonenumbers.geocoding.PrefixFileReader;
+import com.google.i18n.phonenumbers.prefixmapper.PrefixFileReader;
 
 import java.util.Locale;
 

java/internal/prefixmapper/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.googlecode.libphonenumber</groupId>
+  <artifactId>prefixmapper</artifactId>
+  <version>2.10-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <url>http://code.google.com/p/libphonenumber/</url>
+
+  <parent>
+    <groupId>com.googlecode.libphonenumber</groupId>
+    <artifactId>libphonenumber-parent</artifactId>
+    <version>5.9-SNAPSHOT</version>
+  </parent>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+    <testResources>
+      <testResource>
+        <directory>../../geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data</directory>
+        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data</targetPath>
+      </testResource>
+    </testResources>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.googlecode.libphonenumber</groupId>
+      <artifactId>libphonenumber</artifactId>
+      <version>5.9-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+</project>

java/pom.xml

@@ -81,6 +81,7 @@
     <module>libphonenumber</module>
     <module>geocoder</module>
     <module>demo</module>
+    <module>internal/prefixmapper</module>
   </modules>
 
   <build>

java/release_notes.txt

@@ -1,3 +1,7 @@
+Sep 23, 2013: libphonenumber-5.8.5
+* Code changes:
+  - Restructured the geocoder, moving the utility classes to a new module internal/prefixmapper.
+
 Sep 20, 2013: libphonenumber-5.8.4
 * Metadata changes:
  - Adding a token to indicate which countries have mobile portability.