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

Address Issue 152

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@869 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-03-05 02:19:48 +00:00
parent 0c4c9fdb81
commit ddffcde9f4
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/com/google/zxing/client/result/ResultParser.java
View file

@ -53,8 +53,6 @@ public abstract class ResultParser {
return result; return result;
} else if ((result = VEventResultParser.parse(theResult)) != null) { } else if ((result = VEventResultParser.parse(theResult)) != null) {
return result; return result;
} else if ((result = EmailAddressResultParser.parse(theResult)) != null) {
return result;
} else if ((result = TelResultParser.parse(theResult)) != null) { } else if ((result = TelResultParser.parse(theResult)) != null) {
return result; return result;
} else if ((result = SMSMMSResultParser.parse(theResult)) != null) { } else if ((result = SMSMMSResultParser.parse(theResult)) != null) {
@ -65,6 +63,8 @@ public abstract class ResultParser {
return result; return result;
} else if ((result = URIResultParser.parse(theResult)) != null) { } else if ((result = URIResultParser.parse(theResult)) != null) {
return result; return result;
} else if ((result = EmailAddressResultParser.parse(theResult)) != null) {
return result;
} else if ((result = ISBNResultParser.parse(theResult)) != null) { } else if ((result = ISBNResultParser.parse(theResult)) != null) {
// We depend on ISBN parsing coming before UPC, as it is a subset. // We depend on ISBN parsing coming before UPC, as it is a subset.
return result; return result;

3
core/test/src/com/google/zxing/client/result/URIParsedResultTestCase.java
View file

@ -38,6 +38,9 @@ public final class URIParsedResultTestCase extends TestCase {
doTest("http://google.com", "http://google.com", null); doTest("http://google.com", "http://google.com", null);
doTest("https://google.com", "https://google.com", null); doTest("https://google.com", "https://google.com", null);
doTest("google.com:443", "http://google.com:443", null); doTest("google.com:443", "http://google.com:443", null);
doTest("https://www.google.com/calendar/hosted/google.com/embed?mode=AGENDA&force_login=true&src=google.com_726f6f6d5f6265707075@resource.calendar.google.com",
"https://www.google.com/calendar/hosted/google.com/embed?mode=AGENDA&force_login=true&src=google.com_726f6f6d5f6265707075@resource.calendar.google.com",
null);
} }
public void testURLTO() { public void testURLTO() {