--- /dev/null	2015-04-26 06:51:08.003313989 -0700
+++ new/jdk/src/jdk.jline/share/classes/jdk/internal/jline/AnsiWindowsTerminal.java	2015-06-18 03:05:09.156841128 -0700
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2002-2012, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * http://www.opensource.org/licenses/bsd-license.php
+ */
+package jline;
+
+import jline.internal.Configuration;
+import org.fusesource.jansi.AnsiConsole;
+import org.fusesource.jansi.AnsiOutputStream;
+import org.fusesource.jansi.WindowsAnsiOutputStream;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+
+/**
+ * ANSI-supported {@link WindowsTerminal}.
+ *
+ * @since 2.0
+ */
+public class AnsiWindowsTerminal
+    extends WindowsTerminal
+{
+    private final boolean ansiSupported = detectAnsiSupport();
+
+    @Override
+    public OutputStream wrapOutIfNeeded(OutputStream out) {
+        return wrapOutputStream(out);
+    }
+
+    /**
+     * Returns an ansi output stream handler. We return whatever was
+     * passed if we determine we cannot handle ansi based on Kernel32 calls.
+     * 
+     * @return an @{link AltWindowAnsiOutputStream} instance or the passed 
+     * stream.
+     */
+    private static OutputStream wrapOutputStream(final OutputStream stream) {
+        if (Configuration.isWindows()) {
+            // On windows we know the console does not interpret ANSI codes..
+            try {
+                return new WindowsAnsiOutputStream(stream);
+            } catch (Throwable ignore) {
+                // this happens when JNA is not in the path.. or
+                // this happens when the stdout is being redirected to a file.
+            }
+            // Use the ANSIOutputStream to strip out the ANSI escape sequences.
+            return new AnsiOutputStream(stream);
+        }
+        return stream;
+    }
+
+    private static boolean detectAnsiSupport() {
+        OutputStream out = AnsiConsole.wrapOutputStream(new ByteArrayOutputStream());
+        try {
+            out.close();
+        }
+        catch (Exception e) {
+            // ignore;
+        }
+        return out instanceof WindowsAnsiOutputStream;
+    }
+
+    public AnsiWindowsTerminal() throws Exception {
+        super();
+    }
+
+    @Override
+    public boolean isAnsiSupported() {
+        return ansiSupported;
+    }
+
+    @Override
+    public boolean hasWeirdWrap() {
+        return false;
+    }
+}