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

Oops fixed invalid use of java.net classes

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@922 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-04-30 20:19:20 +00:00
parent 7e86f379ea
commit 0de1fbc623
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
View file

@ -21,8 +21,6 @@ import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.Widget;
import java.net.URI;
/** /**
* A Generator for contact informations, output is in MeCard format. * A Generator for contact informations, output is in MeCard format.
* *

19
zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/Validators.java
View file

@ -16,9 +16,6 @@
package com.google.zxing.web.generator.client; package com.google.zxing.web.generator.client;
import java.net.URL;
import java.net.MalformedURLException;
/** /**
* Helpers methods to check for phone numbers, email addresses, and URL. Other * Helpers methods to check for phone numbers, email addresses, and URL. Other
* general purpose check methods should go here as well. * general purpose check methods should go here as well.
@ -37,13 +34,23 @@ public final class Validators {
} }
public static void validateUrl(String url) throws GeneratorException { public static void validateUrl(String url) throws GeneratorException {
try { if (!isBasicallyValidURI(url)) {
new URL(url);
} catch (MalformedURLException mue) {
throw new GeneratorException("URL is not valid."); throw new GeneratorException("URL is not valid.");
} }
} }
private static boolean isBasicallyValidURI(String uri) {
if (uri == null || uri.indexOf(' ') >= 0 || uri.indexOf('\n') >= 0) {
return false;
}
int period = uri.indexOf('.');
// Look for period in a domain but followed by at least a two-char TLD
if (period >= uri.length() - 2) {
return false;
}
return period >= 0 || uri.indexOf(':') >= 0;
}
public static void validateEmail(String email) throws GeneratorException { public static void validateEmail(String email) throws GeneratorException {
//FIXME: we can have a better check for email here. //FIXME: we can have a better check for email here.
if (!email.matches("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,6}$")) { if (!email.matches("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,6}$")) {