Author: gnodet
Date: Mon Mar 21 16:55:03 2016
New Revision: 1736014
URL: http://svn.apache.org/viewvc?rev=1736014&view=rev
Log:
Fix recent jline3 changes
Modified:
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java
Modified:
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java?rev=1736014&r1=1736013&r2=1736014&view=diff
==============================================================================
---
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java
(original)
+++
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java
Mon Mar 21 16:55:03 2016
@@ -62,6 +62,7 @@ import org.jline.reader.Candidate;
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 @@ public class Builtin {
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 @@ public class Builtin {
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);