Issue 295 and Issue 294, treat ADR as wholly different addresses, not 2 lines of...

[zxing.git] / core / src / com / google / zxing / client / result / AddressBookParsedResult.java

diff --git a/core/src/com/google/zxing/client/result/AddressBookParsedResult.java b/core/src/com/google/zxing/client/result/AddressBookParsedResult.java
index 7ef889c..c84587a 100644 (file)
--- a/core/src/com/google/zxing/client/result/AddressBookParsedResult.java
+++ b/core/src/com/google/zxing/client/result/AddressBookParsedResult.java
@@ -26,7 +26,7 @@ public final class AddressBookParsedResult extends ParsedResult {
   private final String[] phoneNumbers;
   private final String[] emails;
   private final String note;
-  private final String address;
+  private final String[] addresses;
   private final String org;
   private final String birthday;
   private final String title;
@@ -37,7 +37,7 @@ public final class AddressBookParsedResult extends ParsedResult {
                                  String[] phoneNumbers,
                                  String[] emails,
                                  String note,
-                                 String address,
+                                 String[] addresses,
                                  String org,
                                  String birthday,
                                  String title,
@@ -48,7 +48,7 @@ public final class AddressBookParsedResult extends ParsedResult {
     this.phoneNumbers = phoneNumbers;
     this.emails = emails;
     this.note = note;
-    this.address = address;
+    this.addresses = addresses;
     this.org = org;
     this.birthday = birthday;
     this.title = title;
@@ -81,8 +81,8 @@ public final class AddressBookParsedResult extends ParsedResult {
     return note;
   }
 
-  public String getAddress() {
-    return address;
+  public String[] getAddresses() {
+    return addresses;
   }
 
   public String getTitle() {
@@ -110,7 +110,7 @@ public final class AddressBookParsedResult extends ParsedResult {
     maybeAppend(pronunciation, result);
     maybeAppend(title, result);
     maybeAppend(org, result);
-    maybeAppend(address, result);
+    maybeAppend(addresses, result);
     maybeAppend(phoneNumbers, result);
     maybeAppend(emails, result);
     maybeAppend(url, result);