You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/06/11 16:39:49 UTC

[1/2] incubator-tinkerpop git commit: fix for TINKERPOP3-722 Garbled characters in Gremlin Console help screen on Windows

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 861cc312f -> 006aec2f7


fix for TINKERPOP3-722 Garbled characters in Gremlin Console help screen on Windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ad82df59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ad82df59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ad82df59

Branch: refs/heads/master
Commit: ad82df59c7909b5a569596bbab36d223c70e550c
Parents: 19582da
Author: Jason Plurad <pl...@users.noreply.github.com>
Authored: Thu Jun 11 10:09:29 2015 -0400
Committer: Jason Plurad <pl...@users.noreply.github.com>
Committed: Thu Jun 11 10:09:29 2015 -0400

----------------------------------------------------------------------
 .../org/apache/tinkerpop/gremlin/console/Console.groovy   | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ad82df59/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index b101a9a..9a963e3 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -24,12 +24,15 @@ import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader
 import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
 import jline.console.history.FileHistory
 import org.apache.tinkerpop.gremlin.util.iterator.ArrayIterator
+import org.codehaus.groovy.tools.shell.AnsiDetector
 import org.codehaus.groovy.tools.shell.ExitNotification
 import org.codehaus.groovy.tools.shell.Groovysh
 import org.codehaus.groovy.tools.shell.IO
 import org.codehaus.groovy.tools.shell.InteractiveShellRunner
 import org.codehaus.groovy.tools.shell.commands.SetCommand
 import org.codehaus.groovy.tools.shell.util.Preferences
+import org.fusesource.jansi.Ansi
+import org.fusesource.jansi.AnsiConsole
 
 import java.nio.charset.Charset
 import java.util.concurrent.TimeUnit
@@ -43,6 +46,13 @@ class Console {
     static {
         // this is necessary so that terminal doesn't lose focus to AWT
         System.setProperty("java.awt.headless", "true")
+        // must be called before IO(), since it modifies System.in
+        // Install the system adapters, replaces System.out and System.err
+        // Must be called before using IO(), because IO stores refs to System.out and System.err
+        AnsiConsole.systemInstall()
+        // Register jline ansi detector
+        Ansi.setDetector(new AnsiDetector())
+        Ansi.enabled = true
     }
 
     public static final String PREFERENCE_ITERATION_MAX = "max-iteration"


[2/2] incubator-tinkerpop git commit: Merge branch '20140611' of https://github.com/pluradj/incubator-tinkerpop

Posted by sp...@apache.org.
Merge branch '20140611' of https://github.com/pluradj/incubator-tinkerpop


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/006aec2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/006aec2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/006aec2f

Branch: refs/heads/master
Commit: 006aec2f71afb78f88d50df924a2d4717d066bf2
Parents: 861cc31 ad82df5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 11 10:30:42 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 11 10:30:42 2015 -0400

----------------------------------------------------------------------
 .../org/apache/tinkerpop/gremlin/console/Console.groovy   | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------