From 10fcc55c46753f1c1f3e2b5a2659263d7b64578e Mon Sep 17 00:00:00 2001 From: Rogan Creswick Date: Sun, 16 Jun 2013 22:08:45 -0700 Subject: removed debugging statements from upGoerFive rule, caught some exceptions in HeadlessAtom --- .../src/main/java/com/galois/fiveui/HeadlessAtom.java | 14 ++++++++++++-- .../headless/src/main/java/com/galois/fiveui/Reporter.java | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessAtom.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessAtom.java index 01ffae0..12da948 100644 --- a/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessAtom.java +++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessAtom.java @@ -48,8 +48,18 @@ public class HeadlessAtom { * @throws JsonParseException */ public static HeadlessAtom fromJsonObject(JsonObject obj, String dir) throws IOException { - String url = obj.get("url").getAsString(); - String ruleSet = obj.get("ruleSet").getAsString(); + String url = null; + String ruleSet = null; + + try { + url = obj.get("url").getAsString(); + } catch (NullPointerException e) { + } + + try { + ruleSet = obj.get("ruleSet").getAsString(); + } catch (NullPointerException e) { + } if (url == null || ruleSet == null) { throw new JsonParseException("could get either 'url' or 'ruleSet' properties"); diff --git a/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java index 5c0b233..cad8bee 100644 --- a/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java +++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java @@ -92,7 +92,7 @@ public class Reporter { h1().text("Headless Run Summary").end(); p(); ul(); - li().a().href("byUrl.html").text("Results organized by URL").end().end(); + li().a().href("byURL.html").text("Results organized by URL").end().end(); li().a().href("byRule.html").text("Results organized by Rule").end().end(); end(); end(); -- cgit v1.2.3