Oops fixed invalid use of java.net classes

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

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.Widget;
import java.net.URI;
/**
* A Generator for contact informations, output is in MeCard format.
*

View file

@ -16,9 +16,6 @@
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
* general purpose check methods should go here as well.
@ -37,12 +34,22 @@ public final class Validators {
}
public static void validateUrl(String url) throws GeneratorException {
try {
new URL(url);
} catch (MalformedURLException mue) {
if (!isBasicallyValidURI(url)) {
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 {
//FIXME: we can have a better check for email here.