Add id to EC_Params subclasses toString, fix EC_Params.expand

1 files changed, 6 insertions, 7 deletions

diff --git a/src/cz/crcs/ectester/reader/ec/EC_Data.java b/src/cz/crcs/ectester/reader/ec/EC_Data.java
index 49b5316..5197665 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Data.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Data.java
@@ -158,14 +158,13 @@ public class EC_Data {
     }
 
     public void writeCSV(OutputStream out) throws IOException {
-        String[] hex = expand();
         Writer w = new OutputStreamWriter(out);
-        for (int i = 0; i < hex.length; ++i) {
-            w.write(hex[i]);
-            if (i < hex.length - 1) {
-                w.write(",");
-            }
-        }
+        w.write(String.join(",", expand()));
         w.flush();
     }
+
+    @Override
+    public String toString() {
+        return String.join(",", expand());
+    }
 }