Fixing LazySeq result

Author: beothorn

src/com/github/beothorn/clojurecalc/ClojureCalcImpl.java

@@ -1,8 +1,5 @@
 package com.github.beothorn.clojurecalc;
 
-import clojure.java.api.Clojure;
-import clojure.lang.IFn;
-import clojure.lang.LazySeq;
 import com.sun.star.lang.XLocalizable;
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.lang.XSingleComponentFactory;
@@ -11,7 +8,6 @@
 import com.sun.star.registry.XRegistryKey;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.table.XCellRange;
-import java.util.Iterator;
 
 public class ClojureCalcImpl extends WeakBase implements XServiceInfo, XLocalizable, XClojureCalc{
 
@@ -80,23 +76,7 @@ public com.sun.star.lang.Locale getLocale()
 
    public String clj(String exp)
    {
-        String result;
-        ClassLoader previous = Thread.currentThread().getContextClassLoader();
-        final ClassLoader parentClassLoader = ClojureCalcImpl.class.getClassLoader();
-        Thread.currentThread().setContextClassLoader(parentClassLoader);
-        try {
-            IFn eval = Clojure.var("clojure.core", "load-string");
-            IFn str = Clojure.var("clojure.core", "str");
-            IFn apply = Clojure.var("clojure.core", "apply");
-            Object evalResult = eval.invoke(exp);
-            result = apply.invoke(str, evalResult).toString();
-        }catch(Exception e){  
-            result = e.getMessage();
-        } finally {
-            Thread.currentThread().setContextClassLoader(previous);
-        }
-       
-        return result;
+       return ClojureInterpreter.runClojure(exp);
    }
 
    public String clcol(XCellRange cells){

src/com/github/beothorn/clojurecalc/ClojureInterpreter.java

@@ -0,0 +1,45 @@
+package com.github.beothorn.clojurecalc;
+
+import clojure.java.api.Clojure;
+import clojure.lang.IFn;
+import clojure.lang.LazySeq;
+import java.util.Iterator;
+
+public class ClojureInterpreter {
+    public static String runClojure(String exp){
+        if(exp.equals("")) return "";
+        String result;
+        ClassLoader previous = Thread.currentThread().getContextClassLoader();
+        final ClassLoader parentClassLoader = ClojureCalcImpl.class.getClassLoader();
+        Thread.currentThread().setContextClassLoader(parentClassLoader);
+        try {
+            result = evalResultToString(exp);
+        }catch(Exception e){  
+            result = e.getMessage();
+        } finally {
+            Thread.currentThread().setContextClassLoader(previous);
+        }
+       
+        return result;
+    }
+
+    private static String evalResultToString(String exp) {
+        String result;
+        final IFn eval = Clojure.var("clojure.core", "load-string");
+        Object evalResult = eval.invoke(exp);
+        IFn str = Clojure.var("clojure.core", "str");
+        if(evalResult instanceof LazySeq){
+            LazySeq resultCollection = (LazySeq) evalResult;
+            result = "[";
+            for (Iterator it = resultCollection.iterator(); it.hasNext();) {
+                Object object = it.next();
+                result += str.invoke(object).toString()+" ";
+            }
+            result = result.substring(0, result.length() - 1);
+            result += "]";
+        }else{
+            result = str.invoke(evalResult).toString();
+        }
+        return result;
+    }
+}

test/com/github/beothorn/clojurecalc/ClojureInterpreterTests.java

@@ -0,0 +1,18 @@
+package com.github.beothorn.clojurecalc;
+
+import junit.framework.TestCase;
+
+public class ClojureInterpreterTests extends TestCase{
+    public void testExp(){
+        runAndAssert("", "");
+        //TODO: runAndAssert("(1)", "1");
+        runAndAssert("(+ 1 2)", "3");
+        runAndAssert("(map #(* % 2) [1 2 3])", "[2 4 6]");
+        runAndAssert("[ [ 2 4 6 ] ]", "[[2 4 6]]");
+    }    
+
+    private void runAndAssert(final String exp, final String expected) {
+        final String result = ClojureInterpreter.runClojure(exp);
+        junit.framework.Assert.assertEquals(expected, result);
+    }
+}