From 53c06909bec4b7c3bfb399b5823b356bd5e6b19b Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 2 Apr 2016 15:21:39 +0100
Subject: Allow richer description of file list

---
 src/main/java/org/zwobble/couscous/cli/CouscousCli.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/zwobble/couscous/cli/CouscousCli.java')

diff --git a/src/main/java/org/zwobble/couscous/cli/CouscousCli.java b/src/main/java/org/zwobble/couscous/cli/CouscousCli.java
index f363384..693b062 100644
--- a/src/main/java/org/zwobble/couscous/cli/CouscousCli.java
+++ b/src/main/java/org/zwobble/couscous/cli/CouscousCli.java
@@ -3,12 +3,12 @@ package org.zwobble.couscous.cli;
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonObject;
 import com.eclipsesource.json.JsonValue;
-import org.apache.commons.cli.*;
 import org.zwobble.couscous.Backend;
 import org.zwobble.couscous.ast.TypeNode;
 import org.zwobble.couscous.backends.csharp.CsharpBackend;
 import org.zwobble.couscous.backends.python.PythonBackend;
 import org.zwobble.couscous.frontends.java.JavaFrontend;
+import org.zwobble.couscous.util.FileSet;
 
 import java.io.FileReader;
 import java.io.IOException;
@@ -16,8 +16,7 @@ import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static org.zwobble.couscous.util.ExtraLists.*;
+import static org.zwobble.couscous.util.ExtraLists.eagerMap;
 
 public class CouscousCli {
     public static final String FILES = "files";
@@ -42,7 +41,7 @@ public class CouscousCli {
         try {
             List<TypeNode> classNodes = frontend.readSourceDirectory(
                 paths(sourcePaths),
-                paths(files));
+                FileSet.globs(files));
             backend.compile(classNodes);
         } catch (IOException exception) {
             throw new RuntimeException(exception);
-- 
cgit v1.2.3