From e92f0b326d51d89d66a34953af9b568a820e6205 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Tue, 24 Oct 2017 19:15:24 +0200
Subject: Add SnakeYAML library to output YAML.

---
 dist/lib/snakeyaml-1.19.jar               | Bin 0 -> 297518 bytes
 lib/snakeyaml-1.19.jar                    | Bin 0 -> 297518 bytes
 manifest.mf                               |   3 +--
 nbproject/project.properties              |   3 ++-
 src/cz/crcs/ectester/reader/ECTester.java |  11 ++++++++---
 5 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 dist/lib/snakeyaml-1.19.jar
 create mode 100644 lib/snakeyaml-1.19.jar

diff --git a/dist/lib/snakeyaml-1.19.jar b/dist/lib/snakeyaml-1.19.jar
new file mode 100644
index 0000000..7c73a76
Binary files /dev/null and b/dist/lib/snakeyaml-1.19.jar differ
diff --git a/lib/snakeyaml-1.19.jar b/lib/snakeyaml-1.19.jar
new file mode 100644
index 0000000..7c73a76
Binary files /dev/null and b/lib/snakeyaml-1.19.jar differ
diff --git a/manifest.mf b/manifest.mf
index fdec036..2cb1a50 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-Class-Path: lib/jcardsim-3.0.4-SNAPSHOT.jar lib/commons-cli-1.3.1.jar
+Class-Path: lib/jcardsim-3.0.4-SNAPSHOT.jar lib/commons-cli-1.3.1.jar lib/snakeyaml-1.19.jar
 Main-Class: cz.crcs.ectester.reader.ECTester
 
diff --git a/nbproject/project.properties b/nbproject/project.properties
index ad90c49..16be542 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -33,7 +33,8 @@ includes=**
 jar.compress=false
 javac.classpath=\
     lib/jcardsim-3.0.4-SNAPSHOT.jar:\
-    lib/commons-cli-1.3.1.jar
+    lib/commons-cli-1.3.1.jar:\
+    lib/snakeyaml-1.19.jar
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index 1b69998..016e095 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -116,8 +116,8 @@ public class ECTester {
                     case "xml":
                         writer = new XMLOutputWriter(logger.getOutputStream());
                         break;
-                    case "html":
-                        writer = new HTMLOutputWriter();
+                    case "yaml":
+                        writer = new YAMLOutputWriter();
                         break;
                 }
             }
@@ -699,13 +699,18 @@ public class ECTester {
             fresh = cli.hasOption("fresh");
             simulate = cli.hasOption("simulate");
             yes = cli.hasOption("yes");
-            format = cli.getOptionValue("format");
 
             if (cli.hasOption("list-named")) {
                 listNamed = cli.getOptionValue("list-named");
                 return true;
             }
 
+            format = cli.getOptionValue("format");
+            if (!Arrays.asList("text", "xml", "yaml").contains(format)) {
+                System.err.println("Wrong output format " + format + ".");
+                return false;
+            }
+
             if ((key != null || namedKey != null) && (anyPublicKey || anyPrivateKey)) {
                 System.err.print("Can only specify the whole key with --key/--named-key or pubkey and privkey with --public/--named-public and --private/--named-private.");
                 return false;
-- 
cgit v1.2.3-70-g09d2