1 files changed, 15 insertions, 18 deletions

diff --git a/reader/src/main/java/cz/crcs/ectester/reader/output/FileTestWriter.java b/reader/src/main/java/cz/crcs/ectester/reader/output/FileTestWriter.java
index 69e5f41..da8dbfc 100644
--- a/reader/src/main/java/cz/crcs/ectester/reader/output/FileTestWriter.java
+++ b/reader/src/main/java/cz/crcs/ectester/reader/output/FileTestWriter.java
@@ -1,40 +1,37 @@
 package cz.crcs.ectester.reader.output;
 
-import cz.crcs.ectester.common.output.TeeTestWriter;
+import cz.crcs.ectester.common.output.BaseFileTestWriter;
 import cz.crcs.ectester.common.output.TestWriter;
 
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.PrintStream;
 import java.util.regex.Pattern;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class FileTestWriter extends TeeTestWriter {
+public class FileTestWriter extends BaseFileTestWriter {
 
     private static final Pattern PREFIX = Pattern.compile("(text|xml|yaml|yml):.+");
 
     public FileTestWriter(String defaultFormat, boolean systemOut, String[] files) throws ParserConfigurationException, FileNotFoundException {
-        int fLength = files == null ? 0 : files.length;
-        writers = new TestWriter[systemOut ? fLength + 1 : fLength];
-        if (systemOut) {
-            writers[0] = createWriter(defaultFormat, System.out);
-        }
-        for (int i = 0; i < fLength; ++i) {
-            String fName = files[i];
-            String format = null;
-            if (PREFIX.matcher(fName).matches()) {
-                String[] split = fName.split(":", 2);
-                format = split[0];
-                fName = split[1];
-            }
-            writers[i + 1] = createWriter(format, new PrintStream(new FileOutputStream(fName)));
+        super(defaultFormat, systemOut, files);
+    }
+
+    @Override
+    protected String[] matchName(String name) {
+        String[] result = new String[2];
+        if (PREFIX.matcher(name).matches()) {
+            result = name.split(":", 2);
+        } else {
+            result[0] = null;
+            result[1] = name;
         }
+        return result;
     }
 
-    private TestWriter createWriter(String format, PrintStream out) throws ParserConfigurationException {
+    protected TestWriter createWriter(String format, PrintStream out) throws ParserConfigurationException {
         if (format == null) {
             return new TextTestWriter(out);
         }