You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/06/11 15:35:27 UTC
svn commit: r1348840 - in
/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console:
ExitAction.java SubShellAction.java impl/jline/ConsoleImpl.java
Author: jbonofre
Date: Mon Jun 11 13:35:27 2012
New Revision: 1348840
URL: http://svn.apache.org/viewvc?rev=1348840&view=rev
Log:
[KARAF-647] Refactoring the subshell commands using the scope (instead of prefix)
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java?rev=1348840&r1=1348839&r2=1348840&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java Mon Jun 11 13:35:27 2012
@@ -29,10 +29,12 @@ public class ExitAction extends Abstract
public Object doExecute() throws Exception {
// get the current sub-shell
String currentSubShell = (String) session.get("SUBSHELL");
+ String currentScope = (String) session.get("SCOPE");
if (!currentSubShell.isEmpty()) {
if (currentSubShell.contains(":")) {
int index = currentSubShell.lastIndexOf(":");
session.put("SUBSHELL", currentSubShell.substring(0, index));
+ session.put("SCOPE", currentScope.substring(0, index));
} else {
session.put("SUBSHELL", "");
}
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java?rev=1348840&r1=1348839&r2=1348840&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java Mon Jun 11 13:35:27 2012
@@ -28,6 +28,7 @@ public class SubShellAction extends Abst
public Object doExecute() throws Exception {
session.put("SUBSHELL", subShell);
+ session.put("SCOPE", subShell + ":" + session.get("SCOPE"));
return null;
}
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java?rev=1348840&r1=1348839&r2=1348840&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java Mon Jun 11 13:35:27 2012
@@ -251,10 +251,6 @@ public class ConsoleImpl implements Cons
} else {
reader.getHistory().replace(command);
}
- // append the subshell if present
- if (session.get("SUBSHELL") != null && ((String) session.get("SUBSHELL")).trim().length() > 0 && !command.equals("exit")) {
- command = session.get("SUBSHELL") + ":" + command;
- }
try {
new Parser(command).program();
loop = false;