mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finished renaming UPC --> Product in a few places.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@671 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2008-11-06 16:25:39 +00:00
parent 4c5c81e8a5
commit d9dce6b108
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/res/values/strings.xml
View file

@ -81,10 +81,10 @@
<string name="result_email_address">Found email address</string>
<string name="result_geo">Found geographic coordinates</string>
<string name="result_isbn">Found book</string>
<string name="result_product">Found product</string>
<string name="result_sms">Found SMS address</string>
<string name="result_tel">Found phone number</string>
<string name="result_text">Found plain text</string>
<string name="result_upc">Found product</string>
<string name="result_uri">Found URL</string>
<string name="sbc_name">Google Book Search</string>
@ -93,5 +93,5 @@
<string name="title_help">Help</string>
<string name="zxing_url">http://code.google.com/p/zxing</string>
<string name="zxing_user_agent">ZXing-Android/1.0</string>
<string name="zxing_user_agent">ZXing-Android/1.1</string>
</resources>

12
android/src/com/google/zxing/client/android/result/UPCResultHandler.java → android/src/com/google/zxing/client/android/result/ProductResultHandler.java
View file

@ -21,14 +21,14 @@ import com.google.zxing.client.android.R;
import com.google.zxing.client.result.ParsedResult;
import com.google.zxing.client.result.ProductParsedResult;
public class UPCResultHandler extends ResultHandler {
public class ProductResultHandler extends ResultHandler {
private static final int[] mButtons = {
R.string.button_product_search,
R.string.button_web_search
};
public UPCResultHandler(Activity activity, ParsedResult result) {
public ProductResultHandler(Activity activity, ParsedResult result) {
super(activity, result);
}
@ -41,19 +41,19 @@ public class UPCResultHandler extends ResultHandler {
}
public void handleButtonPress(int index) {
ProductParsedResult upcResult = (ProductParsedResult) mResult;
ProductParsedResult productResult = (ProductParsedResult) mResult;
switch (index) {
case 0:
openProductSearch(upcResult.getNormalizedProductID());
openProductSearch(productResult.getNormalizedProductID());
break;
case 1:
webSearch(upcResult.getNormalizedProductID());
webSearch(productResult.getNormalizedProductID());
break;
}
}
public int getDisplayTitle() {
return R.string.result_upc;
return R.string.result_product;
}
}

2
android/src/com/google/zxing/client/android/result/ResultHandlerFactory.java
View file

@ -32,7 +32,7 @@ public class ResultHandlerFactory {
} else if (type.equals(ParsedResultType.EMAIL_ADDRESS)) {
return new EmailAddressResultHandler(activity, result);
} else if (type.equals(ParsedResultType.PRODUCT)) {
return new UPCResultHandler(activity, result);
return new ProductResultHandler(activity, result);
} else if (type.equals(ParsedResultType.URI)) {
return new URIResultHandler(activity, result);
} else if (type.equals(ParsedResultType.TEXT)) {