aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessAtom.java14
-rw-r--r--src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java2
2 files changed, 13 insertions, 3 deletions
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();