minor clean-up: remove some unused variables, add using and @Override annotations.

diff --git a/cpp/src/phonenumbers/regexp_cache.cc b/cpp/src/phonenumbers/regexp_cache.cc
index d010aee..57a139a 100644 (file)
--- a/cpp/src/phonenumbers/regexp_cache.cc
+++ b/cpp/src/phonenumbers/regexp_cache.cc
@@ -23,6 +23,7 @@
 #include "phonenumbers/base/synchronization/lock.h"
 #include "phonenumbers/regexp_adapter.h"
 
+using std::make_pair;
 using std::string;
 
 namespace i18n {

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java b/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
index afbc0b2..9bfa79f 100644 (file)
--- a/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
@@ -33,7 +33,6 @@ import java.util.logging.Logger;
  * An offline mapper from phone numbers to time zones.
  */
 public class PhoneNumberToTimeZonesMapper {
-  private static PhoneNumberToTimeZonesMapper instance = null;
   private static final String MAPPING_DATA_DIRECTORY =
       "/com/google/i18n/phonenumbers/timezones/data/";
   private static final String MAPPING_DATA_FILE_NAME = "map_data";

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
index 34e8d16..c74b21a 100644 (file)
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
@@ -347,7 +347,6 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> {
    */
   private PhoneNumberMatch extractInnerMatch(String candidate, int offset) {
     for (Pattern possibleInnerMatch : INNER_MATCHES) {
-      int rangeStart = 0;
       Matcher groupMatcher = possibleInnerMatch.matcher(candidate);
       boolean isFirstMatch = true;
       while (groupMatcher.find() && maxTries > 0) {
@@ -690,6 +689,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> {
     return true;
   }
 
+  @Override
   public boolean hasNext() {
     if (state == State.NOT_READY) {
       lastMatch = find(searchIndex);
@@ -703,6 +703,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> {
     return state == State.READY;
   }
 
+  @Override
   public PhoneNumberMatch next() {
     // Check the state and find the next match as a side-effect if necessary.
     if (!hasNext()) {
@@ -719,6 +720,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> {
   /**
    * Always throws {@link UnsupportedOperationException} as removal is not supported.
    */
+  @Override
   public void remove() {
     throw new UnsupportedOperationException();
   }

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index 418164a..173461c 100644 (file)
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -58,6 +58,7 @@ import java.util.regex.Pattern;
 public class PhoneNumberUtil {
   // @VisibleForTesting
   static final MetadataLoader DEFAULT_METADATA_LOADER = new MetadataLoader() {
+    @Override
     public InputStream loadMetadata(String metadataFileName) {
       return PhoneNumberUtil.class.getResourceAsStream(metadataFileName);
     }
@@ -487,6 +488,7 @@ public class PhoneNumberUtil {
         }
         return PhoneNumberMatcher.checkNumberGroupingIsValid(
             number, candidate, util, new PhoneNumberMatcher.NumberGroupingChecker() {
+              @Override
               public boolean checkGroups(PhoneNumberUtil util, PhoneNumber number,
                                          StringBuilder normalizedCandidate,
                                          String[] expectedNumberGroups) {
@@ -518,6 +520,7 @@ public class PhoneNumberUtil {
         }
         return PhoneNumberMatcher.checkNumberGroupingIsValid(
             number, candidate, util, new PhoneNumberMatcher.NumberGroupingChecker() {
+              @Override
               public boolean checkGroups(PhoneNumberUtil util, PhoneNumber number,
                                          StringBuilder normalizedCandidate,
                                          String[] expectedNumberGroups) {
@@ -2830,6 +2833,7 @@ public class PhoneNumberUtil {
       final long maxTries) {
 
     return new Iterable<PhoneNumberMatch>() {
+      @Override
       public Iterator<PhoneNumberMatch> iterator() {
         return new PhoneNumberMatcher(
             PhoneNumberUtil.this, text, defaultRegion, leniency, maxTries);