From d389bd18023c7e7fa23f98f79723473a14244709 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Mon, 21 May 2012 12:48:29 +0200 Subject: [PATCH] Document: loading example data: Handle exceptions. * src/main/java/org/glom/web/server/libglom/Document.java: DateFormat.parse() and Double.valueOf() can throw exceptions, though Eclipse did not warn about that. --- ChangeLog | 8 ++++++++ .../java/org/glom/web/server/libglom/Document.java | 20 ++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 748cfc1..7e09569 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-05-21 Murray Cumming + + Document: loading example data: Handle exceptions. + + * src/main/java/org/glom/web/server/libglom/Document.java: + DateFormat.parse() and Double.valueOf() can throw exceptions, though + Eclipse did not warn about that. + 2012-05-20 Murray Cumming Document: load(), save(): Handle the example rows. diff --git a/src/main/java/org/glom/web/server/libglom/Document.java b/src/main/java/org/glom/web/server/libglom/Document.java index 7815b81..23374a1 100644 --- a/src/main/java/org/glom/web/server/libglom/Document.java +++ b/src/main/java/org/glom/web/server/libglom/Document.java @@ -302,7 +302,14 @@ public class Document { return 0; } - return Double.valueOf(str); + double value = 0; + try { + value = Double.valueOf(str); + } catch (NumberFormatException e) { + // e.printStackTrace(); + } + + return value; } private String getStringForDecimal(double value) { @@ -493,8 +500,7 @@ public class Document { try { value = dateFormat.parse(unescaped); } catch (ParseException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + // e.printStackTrace(); } result.setDate(value); break; @@ -505,7 +511,13 @@ public class Document { break; } case TYPE_NUMERIC: { - final double value = Double.valueOf(unescaped); + double value = 0; + try { + value = Double.valueOf(unescaped); + } catch (NumberFormatException e) { + // e.printStackTrace(); + } + result.setNumber(value); break; } -- 2.1.4