Changing to used dynamic dataloading for FieldVerifier
diff --git a/src/com/android/i18n/addressinput/AddressVerificationData.java b/src/com/android/i18n/addressinput/AddressVerificationData.java
index afb9e27..b09fee4 100644
--- a/src/com/android/i18n/addressinput/AddressVerificationData.java
+++ b/src/com/android/i18n/addressinput/AddressVerificationData.java
@@ -27,7 +27,7 @@
/**
* Wraps a Map of address property data to provide the AddressVerificationData API.
*/
-public class AddressVerificationData {
+public class AddressVerificationData implements DataSource{
private final Map<String, String> propertiesMap;
diff --git a/src/com/android/i18n/addressinput/ClientData.java b/src/com/android/i18n/addressinput/ClientData.java
index 1162a1f..c1786cb 100644
--- a/src/com/android/i18n/addressinput/ClientData.java
+++ b/src/com/android/i18n/addressinput/ClientData.java
@@ -31,7 +31,7 @@
* Access point for the cached address verification data. The data contained here will mainly be
* used to build {@link FieldVerifier}'s. This class is implemented as a singleton.
*/
-public class ClientData {
+public class ClientData implements DataSource {
/* Data to bootstrap the process. The data are all regional (country level)
* data. Keys are like "data/US/CA"
@@ -40,7 +40,7 @@
private CacheData cacheData;
- public ClientData(RegionDataConstants regionDataConstants, CacheData cacheData) {
+ public ClientData(CacheData cacheData) {
this.cacheData = cacheData;
buildRegionalData();
}
diff --git a/src/com/android/i18n/addressinput/DataSource.java b/src/com/android/i18n/addressinput/DataSource.java
new file mode 100644
index 0000000..d77f27f
--- /dev/null
+++ b/src/com/android/i18n/addressinput/DataSource.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ * 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.
+ */
+
+package com.android.i18n.addressinput;
+
+// TODO: This interface and AddressVerificationData will be
+// removed when we have created code for static loading of data without using the
+// AddressVerificationData class.
+public interface DataSource {
+ AddressVerificationNodeData getDefaultData(String key);
+ AddressVerificationNodeData get(String key);
+}
diff --git a/src/com/android/i18n/addressinput/FieldVerifier.java b/src/com/android/i18n/addressinput/FieldVerifier.java
index b8a6392..ef7dd86 100644
--- a/src/com/android/i18n/addressinput/FieldVerifier.java
+++ b/src/com/android/i18n/addressinput/FieldVerifier.java
@@ -32,36 +32,27 @@
* provides format and match verification for the postal code field.
*/
public class FieldVerifier {
+
// Assumes root, will be reset to false when initializing with parent.
-
private boolean isRoot = true;
-
private String id;
-
- private AddressVerificationData data;
+ private DataSource data;
private Set<AddressField> used;
-
private Set<AddressField> required;
-
// Known values. Can be either a key, a name in Latin, or a name in native script.
-
private Map<String, String> known;
private String[] keys = {};
-
// Names in Latin.
-
private String[] lnames;
// Names in native script.
-
private String[] names;
private Pattern format;
-
private Pattern match;
- public FieldVerifier(AddressVerificationData data) {
+ public FieldVerifier(DataSource data) {
used = new HashSet<AddressField>();
required = new HashSet<AddressField>();
id = "data";
@@ -239,7 +230,6 @@
}
// Util methods for parsing node content.
-
private static Set<AddressField> parseAddressFields(String value) {
EnumSet<AddressField> result = EnumSet.of(AddressField.COUNTRY);
boolean escaped = false;
diff --git a/src/com/android/i18n/addressinput/MarketVerifier.java b/src/com/android/i18n/addressinput/MarketVerifier.java
index c813c0e..60288a2 100644
--- a/src/com/android/i18n/addressinput/MarketVerifier.java
+++ b/src/com/android/i18n/addressinput/MarketVerifier.java
@@ -16,16 +16,14 @@
package com.android.i18n.addressinput;
-import com.android.i18n.addressinput.testing.AddressDataMapLoader;
-
/**
- * Wrapping for used with android market. Use the method verify(AddressData address, AddressProblems
+ * Wrapper for use with android market. Use the method verify(AddressData address, AddressProblems
* problems) to validate AddressData.
*/
public class MarketVerifier extends StandardAddressVerifier {
public MarketVerifier() {
- super(new FieldVerifier(new AddressVerificationData(AddressDataMapLoader.DATA)),
+ super(new FieldVerifier(new ClientData(CacheData.getInstance())),
MarketChecks.PROBLEM_MAP);
}
}
diff --git a/test/com/android/i18n/addressinput/ClientDataTest.java b/test/com/android/i18n/addressinput/ClientDataTest.java
index 94c4157..3c578aa 100644
--- a/test/com/android/i18n/addressinput/ClientDataTest.java
+++ b/test/com/android/i18n/addressinput/ClientDataTest.java
@@ -20,7 +20,7 @@
private ClientData client;
public void setUp() {
- client = new ClientData(new RegionDataConstants(), CacheData.getInstance());
+ client = new ClientData(CacheData.getInstance());
}
public void testPrefetchCountry() {
diff --git a/test/com/android/i18n/addressinput/FormControllerTest.java b/test/com/android/i18n/addressinput/FormControllerTest.java
index 2d36a1d..f6b3c4c 100644
--- a/test/com/android/i18n/addressinput/FormControllerTest.java
+++ b/test/com/android/i18n/addressinput/FormControllerTest.java
@@ -43,7 +43,7 @@
@Override
public void setUp() {
RegionDataConstants regionDataConstants = new RegionDataConstants();
- clientData = new ClientData(regionDataConstants, CacheData.getInstance());
+ clientData = new ClientData(CacheData.getInstance());
}
public void testRequestDataForAddress() {
