Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5550] trunk/shell/src
|
From: <cr...@us...> - 2009-06-07 14:13:11
|
Revision: 5550
http://jnode.svn.sourceforge.net/jnode/?rev=5550&view=rev
Author: crawley
Date: 2009-06-07 13:39:58 +0000 (Sun, 07 Jun 2009)
Log Message:
-----------
Style and javadoc fixes
Modified Paths:
--------------
trunk/shell/src/shell/org/jnode/shell/CommandInfo.java
trunk/shell/src/shell/org/jnode/shell/CommandLine.java
trunk/shell/src/shell/org/jnode/shell/CommandRunnable.java
trunk/shell/src/shell/org/jnode/shell/CommandRunner.java
trunk/shell/src/shell/org/jnode/shell/CommandShell.java
trunk/shell/src/shell/org/jnode/shell/CommandThreadImpl.java
trunk/shell/src/shell/org/jnode/shell/ShellControlException.java
trunk/shell/src/shell/org/jnode/shell/bjorne/SetFlagArgument.java
trunk/shell/src/shell/org/jnode/shell/syntax/PowersetSyntax.java
trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneCompletionTests.java
Modified: trunk/shell/src/shell/org/jnode/shell/CommandInfo.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/CommandInfo.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/shell/org/jnode/shell/CommandInfo.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -91,7 +91,8 @@
* @param syntaxBundle the syntax definition to parse the command line against
* @param instance a prebuilt command instance
*/
- CommandInfo(Class<?> clazz, String commandName, SyntaxBundle syntaxBundle, ArgumentBundle argBundle, Command instance) {
+ CommandInfo(Class<?> clazz, String commandName, SyntaxBundle syntaxBundle,
+ ArgumentBundle argBundle, Command instance) {
this.clazz = clazz;
this.internal = true;
this.commandName = commandName;
Modified: trunk/shell/src/shell/org/jnode/shell/CommandLine.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/CommandLine.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/shell/org/jnode/shell/CommandLine.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -22,7 +22,6 @@
import java.util.NoSuchElementException;
-import org.apache.log4j.Logger;
import org.jnode.driver.console.CompletionInfo;
import org.jnode.shell.help.CompletionException;
import org.jnode.shell.io.CommandIO;
Modified: trunk/shell/src/shell/org/jnode/shell/CommandRunnable.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/CommandRunnable.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/shell/org/jnode/shell/CommandRunnable.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -17,7 +17,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
- package org.jnode.shell;
+package org.jnode.shell;
public interface CommandRunnable extends Runnable {
Modified: trunk/shell/src/shell/org/jnode/shell/CommandRunner.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/CommandRunner.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/shell/org/jnode/shell/CommandRunner.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -86,22 +86,8 @@
try {
prepare();
execute();
-// } catch (CommandSyntaxException ex) {
-// try {
-// HelpFactory.getHelpFactory().getHelp(commandLine.getCommandName(), commandLine.getCommandInfo()).usage(shellErr);
-// shellErr.println(ex.getMessage());
-// } catch (HelpException e) {
-// shellErr.println("Exception while trying to get the command usage");
-// stackTrace(ex);
-// }
} catch (VmExit ex) {
setRC(ex.getStatus());
-// } catch (Exception ex) {
-// shellErr.println("Exception in command");
-// stackTrace(ex);
-// } catch (Throwable ex) {
-// shellErr.println("Fatal error in command");
-// stackTrace(ex);
} catch (Throwable ex) {
setTerminatingException(ex);
}
Modified: trunk/shell/src/shell/org/jnode/shell/CommandShell.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/CommandShell.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/shell/org/jnode/shell/CommandShell.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -908,7 +908,7 @@
/**
* Run a command script located using the shell's classloader. The behavior is analogous
- * to {@link #runCommandFile(File, String, String[]), with the resourceName used as the
+ * to {@link #runCommandFile(File, String, String[])}, with the resourceName used as the
* alias.
*
* @param resourceName the script resource name.
Modified: trunk/shell/src/shell/org/jnode/shell/CommandThreadImpl.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/CommandThreadImpl.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/shell/org/jnode/shell/CommandThreadImpl.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -33,7 +33,7 @@
private UncaughtExceptionHandler myUncaughtExceptionHandler = new UncaughtExceptionHandler() {
public void uncaughtException(Thread thr, Throwable exc) {
- synchronized(CommandThreadImpl.this) {
+ synchronized (CommandThreadImpl.this) {
terminatingException = exc;
}
}
Modified: trunk/shell/src/shell/org/jnode/shell/ShellControlException.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/ShellControlException.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/shell/org/jnode/shell/ShellControlException.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -17,7 +17,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
- package org.jnode.shell;
+package org.jnode.shell;
/**
* Subtypes of ShellControlException are used by interpreter and should be allowed
Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/SetFlagArgument.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/bjorne/SetFlagArgument.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/shell/org/jnode/shell/bjorne/SetFlagArgument.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -17,7 +17,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
- package org.jnode.shell.bjorne;
+package org.jnode.shell.bjorne;
import org.jnode.driver.console.CompletionInfo;
import org.jnode.shell.CommandLine.Token;
Modified: trunk/shell/src/shell/org/jnode/shell/syntax/PowersetSyntax.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/syntax/PowersetSyntax.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/shell/org/jnode/shell/syntax/PowersetSyntax.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -73,7 +73,7 @@
res = new MuAlternation(label, null,
new MuSequence(new MuAlternation((String) null, childMuSyntaxes),
new MuBackReference(label)));
- }
+ }
res.resolveBackReferences();
return res;
}
Modified: trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneCompletionTests.java
===================================================================
--- trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneCompletionTests.java 2009-06-07 13:18:52 UTC (rev 5549)
+++ trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneCompletionTests.java 2009-06-07 13:39:58 UTC (rev 5550)
@@ -280,6 +280,7 @@
case 'Z':
// Expect completions if the last char is NOT ' '
if (wordStart >= partial.length()) {
+ //
} else {
assertTrue("got no completions: " + diag(partial, completions),
completionWords.size() > 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
