projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Contact qrcode generator on appengine.
[zxing.git]
/
zxing.appspot.com
/
generator
/
src
/
com
/
google
/
zxing
/
web
/
generator
/
client
/
ContactInfoGenerator.java
diff --git
a/zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
b/zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
index
d3d9934
..
af6d599
100644
(file)
--- a/
zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
+++ b/
zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
@@
-116,26
+116,30
@@
public class ContactInfoGenerator implements GeneratorSource {
}
*/
}
*/
- private static String parseTextField(TextBox textBox) throws GeneratorException {
+ private static String parseTextField(
String name,
TextBox textBox) throws GeneratorException {
String input = textBox.getText();
if (input.length() < 1) {
return "";
}
if (input.contains("\n")) {
String input = textBox.getText();
if (input.length() < 1) {
return "";
}
if (input.contains("\n")) {
- throw new GeneratorException(
"F
ield must not contain \\n characters.");
+ throw new GeneratorException(
name + " f
ield must not contain \\n characters.");
}
if (input.contains(";")) {
}
if (input.contains(";")) {
- throw new GeneratorException(
"F
ield must not contains ; characters");
+ throw new GeneratorException(
name + " f
ield must not contains ; characters");
}
return input;
}
private String getNameField() throws GeneratorException {
}
return input;
}
private String getNameField() throws GeneratorException {
- return parseTextField(name);
+ String input = name.getText();
+ if (input.length() < 1) {
+ throw new GeneratorException("Name must be at least 1 character.");
+ }
+ return parseTextField("Name", name);
}
private String getCompanyField() throws GeneratorException {
}
private String getCompanyField() throws GeneratorException {
- return parseTextField(company);
+ return parseTextField(
"Company",
company);
}
private String getTelField() throws GeneratorException {
}
private String getTelField() throws GeneratorException {
@@
-171,15
+175,15
@@
public class ContactInfoGenerator implements GeneratorSource {
}
private String getAddressField() throws GeneratorException {
}
private String getAddressField() throws GeneratorException {
- return parseTextField(address);
+ return parseTextField(
"Address",
address);
}
private String getAddress2Field() throws GeneratorException {
}
private String getAddress2Field() throws GeneratorException {
- return parseTextField(address2);
+ return parseTextField(
"Address 2",
address2);
}
private String getMemoField() throws GeneratorException {
}
private String getMemoField() throws GeneratorException {
- return parseTextField(memo);
+ return parseTextField(
"Memo",
memo);
}
public Grid getWidget() {
}
public Grid getWidget() {