You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/08/10 18:28:44 UTC
svn commit: r802847 - in
/felix/trunk/karaf/gshell/gshell-console/src/main/java: jline/
org/apache/felix/karaf/gshell/console/jline/
Author: gnodet
Date: Mon Aug 10 16:28:43 2009
New Revision: 802847
URL: http://svn.apache.org/viewvc?rev=802847&view=rev
Log:
FELIX-1449: tab completion does not work on windows
Added:
felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/
felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/AnsiWindowsTerminal.java
felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/NoInterruptUnixTerminal.java
Modified:
felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/Console.java
felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java
Added: felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/AnsiWindowsTerminal.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/AnsiWindowsTerminal.java?rev=802847&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/AnsiWindowsTerminal.java (added)
+++ felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/AnsiWindowsTerminal.java Mon Aug 10 16:28:43 2009
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package jline;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+public class AnsiWindowsTerminal extends WindowsTerminal {
+
+ @Override
+ public boolean isANSISupported() {
+ return true;
+ }
+
+ @Override
+ public int readCharacter(InputStream in) throws IOException {
+ return in.read();
+ }
+
+ public int readDirectChar(InputStream in) throws IOException {
+ return super.readCharacter(in);
+ }
+
+}
Added: felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/NoInterruptUnixTerminal.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/NoInterruptUnixTerminal.java?rev=802847&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/NoInterruptUnixTerminal.java (added)
+++ felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/NoInterruptUnixTerminal.java Mon Aug 10 16:28:43 2009
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package jline;
+
+import java.io.IOException;
+
+public class NoInterruptUnixTerminal extends UnixTerminal {
+
+ @Override
+ public void initializeTerminal() throws IOException, InterruptedException {
+ super.initializeTerminal();
+ stty("intr undef");
+ }
+
+ @Override
+ public void restoreTerminal() throws Exception {
+ stty("intr ^C");
+ super.restoreTerminal();
+ }
+
+}
Modified: felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/Console.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/Console.java?rev=802847&r1=802846&r2=802847&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/Console.java (original)
+++ felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/Console.java Mon Aug 10 16:28:43 2009
@@ -30,6 +30,8 @@
import jline.ConsoleReader;
import jline.Terminal;
import jline.UnsupportedTerminal;
+import jline.WindowsTerminal;
+import jline.AnsiWindowsTerminal;
import org.apache.felix.karaf.gshell.console.Completer;
import org.osgi.service.command.CommandProcessor;
import org.osgi.service.command.CommandSession;
@@ -44,7 +46,7 @@
private CommandSession session;
private ConsoleReader reader;
- private BlockingQueue<Integer> queue = new ArrayBlockingQueue<Integer>(1024);
+ private BlockingQueue<Integer> queue;
private boolean interrupt;
private Thread pipe;
private boolean running;
@@ -66,11 +68,13 @@
this.in = in;
this.out = out;
this.err = err;
+ this.queue = new ArrayBlockingQueue<Integer>(1024);
+ this.terminal = term == null ? new UnsupportedTerminal() : term;
this.consoleInput = new ConsoleInputStream();
this.session = processor.createSession(this.consoleInput, this.out, this.err);
this.session.put("SCOPE", "shell:osgi:*");
- this.terminal = term == null ? new UnsupportedTerminal() : term;
this.closeCallback = closeCallback;
+
reader = new ConsoleReader(this.consoleInput,
new PrintWriter(this.out),
getClass().getResourceAsStream("keybinding.properties"),
@@ -227,7 +231,12 @@
{
try
{
- int c = in.read();
+ int c;
+ if (terminal instanceof AnsiWindowsTerminal) {
+ c = ((AnsiWindowsTerminal) terminal).readDirectChar(in);
+ } else {
+ c = terminal.readCharacter(in);
+ }
if (c == -1 || c == 4)
{
//System.err.println("Received " + c + " ... closing");
Modified: felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java?rev=802847&r1=802846&r2=802847&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java (original)
+++ felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java Mon Aug 10 16:28:43 2009
@@ -1,13 +1,9 @@
package org.apache.felix.karaf.gshell.console.jline;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.io.IOException;
-
import jline.Terminal;
-import jline.WindowsTerminal;
-import jline.UnixTerminal;
import jline.UnsupportedTerminal;
+import jline.AnsiWindowsTerminal;
+import jline.NoInterruptUnixTerminal;
public class TerminalFactory {
@@ -34,6 +30,7 @@
term = t;
}
} catch (Throwable e) {
+ System.out.println("Using an unsupported terminal: " + e.toString());
term = new UnsupportedTerminal();
}
}
@@ -43,26 +40,4 @@
term = null;
}
- public static class AnsiWindowsTerminal extends WindowsTerminal {
- @Override
- public boolean isANSISupported() {
- return true;
- }
- }
-
- public static class NoInterruptUnixTerminal extends UnixTerminal {
- @Override
- public void initializeTerminal() throws IOException, InterruptedException {
- super.initializeTerminal();
- stty("intr undef");
- }
-
- @Override
- public void restoreTerminal() throws Exception {
- stty("intr ^C");
- super.restoreTerminal();
- }
-
- }
-
}