commit dcd07ffb6e0ec08f5e171cff79b7e1ee4c03f33f
author Guillaume Nodet <gnodet@apache.org> Mon Mar 21 16:55:03 2016 +0000
committer Guillaume Nodet <gnodet@apache.org> Mon Mar 21 16:55:03 2016 +0000
tree bcd0af4a03fb69d664cd2979013c863ed562a601
parent c4ed17bf145ddd801486b99b4ace073359c0efb4

Fix recent jline3 changes

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1736014 13f79535-47bb-0310-9956-ffa450edef68

gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java

diff --git a/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java b/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java
index 8b4556f..b0b10a7 100644
--- a/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java
+++ b/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java
@@ -62,6 +62,7 @@
 import org.jline.reader.LineReader;
 import org.jline.reader.ParsedLine;
 import org.jline.reader.Widget;
+import org.jline.terminal.Terminal;
 
 import static org.apache.felix.gogo.jline.Shell.*;
 
@@ -619,7 +620,7 @@
         List<Candidate> candidates = new ArrayList<>();
         new FilesCompleter(session.currentDir()) {
             @Override
-            protected String getDisplay(Path p) {
+            protected String getDisplay(Terminal terminal, Path p) {
                 return getFileDisplay(session, p);
             }
         }.complete(reader, line, candidates);
@@ -632,7 +633,7 @@
         List<Candidate> candidates = new ArrayList<>();
         new DirectoriesCompleter(session.currentDir()) {
             @Override
-            protected String getDisplay(Path p) {
+            protected String getDisplay(Terminal terminal, Path p) {
                 return getFileDisplay(session, p);
             }
         }.complete(reader, line, candidates);