From: srowen Date: Thu, 5 Mar 2009 02:28:57 +0000 (+0000) Subject: Backed out last 'fix' to email address parsing -- isn't going to work. Needs a better... X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=0de61516de86b8cb2ed9c2d1892e2cec4805784c Backed out last 'fix' to email address parsing -- isn't going to work. Needs a better, real fix. git-svn-id: http://zxing.googlecode.com/svn/trunk@871 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/core/src/com/google/zxing/client/result/ResultParser.java b/core/src/com/google/zxing/client/result/ResultParser.java index 3b8e0762..d8172b4b 100644 --- a/core/src/com/google/zxing/client/result/ResultParser.java +++ b/core/src/com/google/zxing/client/result/ResultParser.java @@ -53,6 +53,8 @@ public abstract class ResultParser { return result; } else if ((result = VEventResultParser.parse(theResult)) != null) { return result; + } else if ((result = EmailAddressResultParser.parse(theResult)) != null) { + return result; } else if ((result = TelResultParser.parse(theResult)) != null) { return result; } else if ((result = SMSMMSResultParser.parse(theResult)) != null) { @@ -63,8 +65,6 @@ public abstract class ResultParser { return result; } else if ((result = URIResultParser.parse(theResult)) != null) { return result; - } else if ((result = EmailAddressResultParser.parse(theResult)) != null) { - return result; } else if ((result = ISBNResultParser.parse(theResult)) != null) { // We depend on ISBN parsing coming before UPC, as it is a subset. return result;