From: <cr...@us...> - 2008-03-30 02:24:39
|
Revision: 3912 http://jnode.svn.sourceforge.net/jnode/?rev=3912&view=rev Author: crawley Date: 2008-03-29 19:24:36 -0700 (Sat, 29 Mar 2008) Log Message: ----------- Did an eclipse "organize imports" for the shell tree to get rid of unused import warnings. Modified Paths: -------------- trunk/shell/.settings/org.eclipse.jdt.core.prefs trunk/shell/src/shell/org/jnode/shell/CommandLine.java trunk/shell/src/shell/org/jnode/shell/CommandShell.java trunk/shell/src/shell/org/jnode/shell/RedirectingInterpreter.java trunk/shell/src/shell/org/jnode/shell/Shell.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizerTests.java trunk/shell/src/shell/org/jnode/shell/command/DateCommand.java trunk/shell/src/shell/org/jnode/shell/command/DisassembleCommand.java trunk/shell/src/shell/org/jnode/shell/command/EchoCommand.java trunk/shell/src/shell/org/jnode/shell/command/ExecCommand.java trunk/shell/src/shell/org/jnode/shell/command/ExitCommand.java trunk/shell/src/shell/org/jnode/shell/command/GcCommand.java trunk/shell/src/shell/org/jnode/shell/command/HelpCommand.java trunk/shell/src/shell/org/jnode/shell/command/HistoryCommand.java trunk/shell/src/shell/org/jnode/shell/command/KillCommand.java trunk/shell/src/shell/org/jnode/shell/command/MemoryCommand.java trunk/shell/src/shell/org/jnode/shell/command/OnHeapCommand.java trunk/shell/src/shell/org/jnode/shell/command/RunCommand.java trunk/shell/src/shell/org/jnode/shell/command/SetCommand.java trunk/shell/src/shell/org/jnode/shell/command/bsh/BshCommand.java trunk/shell/src/shell/org/jnode/shell/command/debug/DebugCommand.java trunk/shell/src/shell/org/jnode/shell/command/debug/UDPOutputCommand.java trunk/shell/src/shell/org/jnode/shell/command/test/SuiteCommand.java trunk/shell/src/shell/org/jnode/shell/command/unix/UnixTestCommand.java trunk/shell/src/shell/org/jnode/shell/proclet/AbstractProxyPrintStream.java trunk/shell/src/shell/org/jnode/shell/proclet/ProcletContext.java trunk/shell/src/shell/org/jnode/shell/proclet/ProcletIOContext.java trunk/shell/src/shell/org/jnode/shell/proclet/ProcletProxyInputStream.java trunk/shell/src/shell/org/jnode/shell/proclet/ProcletProxyPrintStream.java trunk/shell/src/shell/org/jnode/shell/proclet/ProxyStream.java trunk/shell/src/test/org/jnode/test/shell/Cassowary.java trunk/shell/src/test/org/jnode/test/shell/CompletionInfoTest.java trunk/shell/src/test/org/jnode/test/shell/CompletionTest.java trunk/shell/src/test/org/jnode/test/shell/DeviceManager.java trunk/shell/src/test/org/jnode/test/shell/syntax/AlternativesSyntaxTest.java trunk/shell/src/test/org/jnode/test/shell/syntax/ArgumentMultiplicityTest.java trunk/shell/src/test/org/jnode/test/shell/syntax/ArgumentTypesTest.java trunk/shell/src/test/org/jnode/test/shell/syntax/CommandLineTest.java trunk/shell/src/test/org/jnode/test/shell/syntax/MuParserTest.java trunk/shell/src/test/org/jnode/test/shell/syntax/MuParserTest2.java trunk/shell/src/test/org/jnode/test/shell/syntax/OptionSetSyntaxTest.java trunk/shell/src/test/org/jnode/test/shell/syntax/OptionSyntaxTest.java trunk/shell/src/test/org/jnode/test/shell/syntax/PowersetSyntaxTest.java trunk/shell/src/test/org/jnode/test/shell/syntax/RepeatedSyntaxTest.java trunk/shell/src/test/org/jnode/test/shell/syntax/SequenceSyntaxTest.java Modified: trunk/shell/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/shell/.settings/org.eclipse.jdt.core.prefs 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/.settings/org.eclipse.jdt.core.prefs 2008-03-30 02:24:36 UTC (rev 3912) @@ -1,12 +1,56 @@ -#Tue Apr 12 20:13:19 CEST 2005 +#Sun Mar 30 11:39:36 EST 2008 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning Modified: trunk/shell/src/shell/org/jnode/shell/CommandLine.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/CommandLine.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/CommandLine.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -29,11 +29,10 @@ import org.jnode.shell.help.Help; import org.jnode.shell.help.HelpException; import org.jnode.shell.help.Parameter; - -import org.jnode.shell.syntax.CommandSyntaxException; -import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.ArgumentBundle; import org.jnode.shell.syntax.ArgumentSyntax; +import org.jnode.shell.syntax.CommandSyntaxException; +import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.RepeatSyntax; import org.jnode.shell.syntax.Syntax; Modified: trunk/shell/src/shell/org/jnode/shell/CommandShell.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/CommandShell.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/CommandShell.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -21,18 +21,18 @@ package org.jnode.shell; +import java.io.BufferedReader; import java.io.Closeable; import java.io.File; +import java.io.FileReader; import java.io.FilterInputStream; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.PrintStream; import java.io.Reader; import java.io.StringReader; -import java.io.IOException; -import java.io.BufferedReader; -import java.io.FileReader; import java.security.AccessController; import java.security.PrivilegedAction; import java.text.DateFormat; @@ -42,12 +42,12 @@ import javax.naming.NameNotFoundException; import org.apache.log4j.Logger; -import org.jnode.driver.console.InputHistory; import org.jnode.driver.console.CompletionInfo; +import org.jnode.driver.console.ConsoleEvent; +import org.jnode.driver.console.ConsoleListener; import org.jnode.driver.console.ConsoleManager; +import org.jnode.driver.console.InputHistory; import org.jnode.driver.console.TextConsole; -import org.jnode.driver.console.ConsoleListener; -import org.jnode.driver.console.ConsoleEvent; import org.jnode.driver.console.textscreen.KeyboardInputStream; import org.jnode.naming.InitialNaming; import org.jnode.shell.alias.AliasManager; Modified: trunk/shell/src/shell/org/jnode/shell/RedirectingInterpreter.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/RedirectingInterpreter.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/RedirectingInterpreter.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -33,12 +33,6 @@ import java.util.List; import org.apache.log4j.Logger; -import org.jnode.driver.console.CompletionInfo; -import org.jnode.shell.help.Argument; -import org.jnode.shell.help.CompletionException; -import org.jnode.shell.help.Help; -import org.jnode.shell.help.Parameter; -import org.jnode.shell.help.argument.AliasArgument; import org.jnode.shell.help.argument.FileArgument; import org.jnode.shell.syntax.CommandSyntaxException; Modified: trunk/shell/src/shell/org/jnode/shell/Shell.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/Shell.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/Shell.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -21,11 +21,11 @@ package org.jnode.shell; -import org.jnode.shell.alias.AliasManager; -import org.jnode.shell.syntax.SyntaxManager; import org.jnode.driver.console.Console; import org.jnode.driver.console.InputCompleter; import org.jnode.driver.console.InputHistory; +import org.jnode.shell.alias.AliasManager; +import org.jnode.shell.syntax.SyntaxManager; /** * @author epr Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -16,7 +16,6 @@ import java.io.PrintStream; import java.util.HashMap; -import org.jnode.shell.Command; import org.jnode.shell.CommandInfo; import org.jnode.shell.CommandInterpreter; import org.jnode.shell.CommandLine; Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -1,7 +1,5 @@ package org.jnode.shell.bjorne; -import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_LINE; -import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_STREAM; import static org.jnode.shell.bjorne.BjorneInterpreter.CMD_BRACE_GROUP; import static org.jnode.shell.bjorne.BjorneInterpreter.CMD_COMMAND; import static org.jnode.shell.bjorne.BjorneInterpreter.CMD_ELIF; @@ -36,6 +34,8 @@ import static org.jnode.shell.bjorne.BjorneToken.TOK_DSEMI; import static org.jnode.shell.bjorne.BjorneToken.TOK_ELIF; import static org.jnode.shell.bjorne.BjorneToken.TOK_ELSE; +import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_LINE; +import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_STREAM; import static org.jnode.shell.bjorne.BjorneToken.TOK_ESAC; import static org.jnode.shell.bjorne.BjorneToken.TOK_FI; import static org.jnode.shell.bjorne.BjorneToken.TOK_FOR; Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -1,7 +1,5 @@ package org.jnode.shell.bjorne; -import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_LINE; -import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_STREAM; import static org.jnode.shell.bjorne.BjorneToken.RULE_1_CONTEXT; import static org.jnode.shell.bjorne.BjorneToken.RULE_5_CONTEXT; import static org.jnode.shell.bjorne.BjorneToken.RULE_6_CONTEXT; @@ -23,6 +21,8 @@ import static org.jnode.shell.bjorne.BjorneToken.TOK_DSEMI; import static org.jnode.shell.bjorne.BjorneToken.TOK_ELIF; import static org.jnode.shell.bjorne.BjorneToken.TOK_ELSE; +import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_LINE; +import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_STREAM; import static org.jnode.shell.bjorne.BjorneToken.TOK_ESAC; import static org.jnode.shell.bjorne.BjorneToken.TOK_FI; import static org.jnode.shell.bjorne.BjorneToken.TOK_FOR; Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizerTests.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizerTests.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizerTests.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -1,7 +1,5 @@ package org.jnode.shell.bjorne; -import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_LINE; -import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_STREAM; import static org.jnode.shell.bjorne.BjorneToken.RULE_1_CONTEXT; import static org.jnode.shell.bjorne.BjorneToken.RULE_5_CONTEXT; import static org.jnode.shell.bjorne.BjorneToken.RULE_6_CONTEXT; @@ -23,6 +21,8 @@ import static org.jnode.shell.bjorne.BjorneToken.TOK_DSEMI; import static org.jnode.shell.bjorne.BjorneToken.TOK_ELIF; import static org.jnode.shell.bjorne.BjorneToken.TOK_ELSE; +import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_LINE; +import static org.jnode.shell.bjorne.BjorneToken.TOK_END_OF_STREAM; import static org.jnode.shell.bjorne.BjorneToken.TOK_ESAC; import static org.jnode.shell.bjorne.BjorneToken.TOK_FI; import static org.jnode.shell.bjorne.BjorneToken.TOK_FOR; Modified: trunk/shell/src/shell/org/jnode/shell/command/DateCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/DateCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/DateCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -25,7 +25,7 @@ import javax.naming.NameNotFoundException; -import org.jnode.shell.help.*; +import org.jnode.shell.help.Help; /** * A shell command to access the display the system date. Modified: trunk/shell/src/shell/org/jnode/shell/command/DisassembleCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/DisassembleCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/DisassembleCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -21,6 +21,8 @@ package org.jnode.shell.command; +import java.io.OutputStreamWriter; + import org.jnode.shell.help.Help; import org.jnode.shell.help.Parameter; import org.jnode.shell.help.ParsedArguments; @@ -29,8 +31,6 @@ import org.jnode.shell.help.argument.StringArgument; import org.jnode.vm.classmgr.VmType; -import java.io.OutputStreamWriter; - /** * @author Levente S\u00e1ntha */ Modified: trunk/shell/src/shell/org/jnode/shell/command/EchoCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/EchoCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/EchoCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -27,8 +27,9 @@ import org.jnode.shell.AbstractCommand; import org.jnode.shell.CommandLine; -import org.jnode.shell.Command; -import org.jnode.shell.help.*; +import org.jnode.shell.help.Argument; +import org.jnode.shell.help.Help; +import org.jnode.shell.help.Parameter; import org.jnode.shell.help.argument.StringArgument; /** Modified: trunk/shell/src/shell/org/jnode/shell/command/ExecCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/ExecCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/ExecCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -26,7 +26,9 @@ import org.jnode.shell.AbstractCommand; import org.jnode.shell.CommandLine; -import org.jnode.shell.help.*; +import org.jnode.shell.help.Argument; +import org.jnode.shell.help.Help; +import org.jnode.shell.help.Parameter; import org.jnode.shell.help.argument.ClassNameArgument; /** Modified: trunk/shell/src/shell/org/jnode/shell/command/ExitCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/ExitCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/ExitCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -1,5 +1,8 @@ package org.jnode.shell.command; +import java.io.InputStream; +import java.io.PrintStream; + import org.jnode.naming.InitialNaming; import org.jnode.shell.AbstractCommand; import org.jnode.shell.CommandLine; @@ -7,9 +10,6 @@ import org.jnode.shell.ShellManager; import org.jnode.shell.help.Help; -import java.io.InputStream; -import java.io.PrintStream; - /** * @author Levente S\u00e1ntha */ Modified: trunk/shell/src/shell/org/jnode/shell/command/GcCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/GcCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/GcCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -26,10 +26,10 @@ import org.jnode.shell.AbstractCommand; import org.jnode.shell.CommandLine; -import org.jnode.shell.help.*; +import org.jnode.shell.help.Help; +import org.jnode.util.NumberUtils; import org.jnode.vm.Vm; import org.jnode.vm.memmgr.GCStatistics; -import org.jnode.util.NumberUtils; /** * @author epr Modified: trunk/shell/src/shell/org/jnode/shell/command/HelpCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/HelpCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/HelpCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -21,8 +21,6 @@ package org.jnode.shell.command; -import java.lang.reflect.Field; - import javax.naming.NameNotFoundException; import org.jnode.shell.AbstractCommand; @@ -34,9 +32,7 @@ import org.jnode.shell.help.HelpException; import org.jnode.shell.help.Parameter; import org.jnode.shell.help.ParsedArguments; -import org.jnode.shell.help.Help.Info; import org.jnode.shell.help.argument.AliasArgument; -import org.jnode.shell.syntax.Argument; import org.jnode.shell.syntax.ArgumentBundle; import org.jnode.shell.syntax.Syntax; import org.jnode.shell.syntax.SyntaxManager; Modified: trunk/shell/src/shell/org/jnode/shell/command/HistoryCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/HistoryCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/HistoryCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -20,14 +20,17 @@ */ package org.jnode.shell.command; -import java.io.PrintStream; -import javax.naming.NameNotFoundException; +import java.io.PrintStream; +import javax.naming.NameNotFoundException; + import org.jnode.driver.console.InputHistory; -import org.jnode.shell.help.*; +import org.jnode.shell.Shell; +import org.jnode.shell.ShellUtils; +import org.jnode.shell.help.Help; +import org.jnode.shell.help.Parameter; +import org.jnode.shell.help.Syntax; import org.jnode.shell.help.argument.OptionArgument; -import org.jnode.shell.Shell; -import org.jnode.shell.ShellUtils; /** A shell command to access the data in the CommandHistory class. * @author Matt Paine Modified: trunk/shell/src/shell/org/jnode/shell/command/KillCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/KillCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/KillCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -27,9 +27,9 @@ import org.jnode.shell.AbstractCommand; import org.jnode.shell.CommandLine; import org.jnode.shell.help.Help; +import org.jnode.shell.help.Parameter; import org.jnode.shell.help.ParsedArguments; import org.jnode.shell.help.Syntax; -import org.jnode.shell.help.Parameter; import org.jnode.shell.help.argument.IntegerArgument; /** Modified: trunk/shell/src/shell/org/jnode/shell/command/MemoryCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/MemoryCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/MemoryCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -26,7 +26,6 @@ import org.jnode.shell.AbstractCommand; import org.jnode.shell.CommandLine; -import org.jnode.shell.Command; import org.jnode.shell.help.Help; import org.jnode.util.NumberUtils; Modified: trunk/shell/src/shell/org/jnode/shell/command/OnHeapCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/OnHeapCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/OnHeapCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -25,13 +25,11 @@ import java.io.PrintStream; import org.jnode.shell.AbstractCommand; -import org.jnode.shell.Command; import org.jnode.shell.CommandLine; import org.jnode.shell.help.Help; import org.jnode.shell.help.Parameter; import org.jnode.shell.help.ParsedArguments; import org.jnode.shell.help.argument.IntegerArgument; -import org.jnode.shell.help.argument.LongArgument; import org.jnode.shell.help.argument.SizeArgument; import org.jnode.vm.Vm; import org.jnode.vm.memmgr.HeapStatistics; Modified: trunk/shell/src/shell/org/jnode/shell/command/RunCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/RunCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/RunCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -1,20 +1,21 @@ package org.jnode.shell.command; +import java.io.File; +import java.io.InputStream; +import java.io.PrintStream; + +import javax.naming.NameNotFoundException; + import org.jnode.shell.AbstractCommand; import org.jnode.shell.CommandLine; +import org.jnode.shell.CommandShell; +import org.jnode.shell.Shell; import org.jnode.shell.ShellUtils; -import org.jnode.shell.Shell; -import org.jnode.shell.CommandShell; import org.jnode.shell.help.Help; import org.jnode.shell.help.Parameter; import org.jnode.shell.help.ParsedArguments; import org.jnode.shell.help.argument.FileArgument; -import javax.naming.NameNotFoundException; -import java.io.InputStream; -import java.io.PrintStream; -import java.io.File; - /** * Load and execute a command file. * Modified: trunk/shell/src/shell/org/jnode/shell/command/SetCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/SetCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/SetCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -21,16 +21,16 @@ package org.jnode.shell.command; +import java.io.InputStream; +import java.io.PrintStream; + +import org.jnode.shell.AbstractCommand; +import org.jnode.shell.CommandLine; +import org.jnode.shell.syntax.Argument; import org.jnode.shell.syntax.PropertyNameArgument; -import org.jnode.shell.syntax.Argument; import org.jnode.shell.syntax.StringArgument; -import org.jnode.shell.AbstractCommand; -import org.jnode.shell.CommandLine; -import java.io.InputStream; -import java.io.PrintStream; - /** * Shell command to set property values. * Modified: trunk/shell/src/shell/org/jnode/shell/command/bsh/BshCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/bsh/BshCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/bsh/BshCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -21,16 +21,24 @@ package org.jnode.shell.command.bsh; -import java.io.*; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; -import bsh.Interpreter; -import org.jnode.shell.help.*; -import org.jnode.shell.help.argument.StringArgument; +import org.jnode.shell.AbstractCommand; +import org.jnode.shell.CommandLine; +import org.jnode.shell.help.Help; +import org.jnode.shell.help.Parameter; +import org.jnode.shell.help.ParsedArguments; +import org.jnode.shell.help.Syntax; import org.jnode.shell.help.argument.FileArgument; import org.jnode.shell.help.argument.OptionArgument; -import org.jnode.shell.AbstractCommand; -import org.jnode.shell.CommandLine; +import org.jnode.shell.help.argument.StringArgument; +import bsh.Interpreter; + /** * @author Levente S\u00e1ntha */ Modified: trunk/shell/src/shell/org/jnode/shell/command/debug/DebugCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/debug/DebugCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/debug/DebugCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -3,12 +3,13 @@ */ package org.jnode.shell.command.debug; +import gnu.classpath.jdwp.JNodeSocketTransport; import gnu.classpath.jdwp.Jdwp; -import gnu.classpath.jdwp.JNodeSocketTransport; -import org.jnode.shell.help.argument.IntegerArgument; + import org.jnode.shell.help.Help; import org.jnode.shell.help.Parameter; import org.jnode.shell.help.ParsedArguments; +import org.jnode.shell.help.argument.IntegerArgument; /** * Starts up the remote debugger under JNode. Modified: trunk/shell/src/shell/org/jnode/shell/command/debug/UDPOutputCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/debug/UDPOutputCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/debug/UDPOutputCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -32,7 +32,6 @@ import org.jnode.debug.UDPAppender; import org.jnode.debug.UDPOutputStream; import org.jnode.shell.AbstractCommand; -import org.jnode.shell.Command; import org.jnode.shell.CommandLine; import org.jnode.shell.help.Help; import org.jnode.shell.help.Parameter; Modified: trunk/shell/src/shell/org/jnode/shell/command/test/SuiteCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/test/SuiteCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/test/SuiteCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -23,9 +23,7 @@ import java.io.InputStream; import java.io.PrintStream; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import java.util.Set; import junit.framework.Test; Modified: trunk/shell/src/shell/org/jnode/shell/command/unix/UnixTestCommand.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/command/unix/UnixTestCommand.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/command/unix/UnixTestCommand.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -21,17 +21,17 @@ package org.jnode.shell.command.unix; -import org.jnode.shell.AbstractCommand; -import org.jnode.shell.CommandLine; -import org.jnode.shell.help.SyntaxErrorException; - import java.io.File; import java.io.InputStream; import java.io.PrintStream; import java.util.HashMap; import java.util.Stack; +import org.jnode.shell.AbstractCommand; +import org.jnode.shell.CommandLine; +import org.jnode.shell.help.SyntaxErrorException; + /** * JNode implementation of the UNIX 'test' command * @author cr...@jn... Modified: trunk/shell/src/shell/org/jnode/shell/proclet/AbstractProxyPrintStream.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/proclet/AbstractProxyPrintStream.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/proclet/AbstractProxyPrintStream.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -45,14 +45,14 @@ package org.jnode.shell.proclet; +import gnu.classpath.SystemProperties; + import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; +import java.util.Formatter; import java.util.Locale; -import java.util.Formatter; -import gnu.classpath.SystemProperties; - /** * This class provides some infrastructure for PrintStream proxies. * Modified: trunk/shell/src/shell/org/jnode/shell/proclet/ProcletContext.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/proclet/ProcletContext.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/proclet/ProcletContext.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -29,8 +29,8 @@ import java.util.Properties; import org.jnode.shell.CommandThread; +import org.jnode.vm.VmExit; import org.jnode.vm.VmSystem; -import org.jnode.vm.VmExit; /** * This class implements the proclet-specific state used in the JNode proclet Modified: trunk/shell/src/shell/org/jnode/shell/proclet/ProcletIOContext.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/proclet/ProcletIOContext.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/proclet/ProcletIOContext.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -23,6 +23,7 @@ import java.io.InputStream; import java.io.PrintStream; + import org.jnode.vm.IOContext; import org.jnode.vm.VmSystem; Modified: trunk/shell/src/shell/org/jnode/shell/proclet/ProcletProxyInputStream.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/proclet/ProcletProxyInputStream.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/proclet/ProcletProxyInputStream.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; + import org.jnode.vm.VmSystem; /** Modified: trunk/shell/src/shell/org/jnode/shell/proclet/ProcletProxyPrintStream.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/proclet/ProcletProxyPrintStream.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/proclet/ProcletProxyPrintStream.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -22,6 +22,7 @@ package org.jnode.shell.proclet; import java.io.PrintStream; + import org.jnode.vm.VmSystem; /** Modified: trunk/shell/src/shell/org/jnode/shell/proclet/ProxyStream.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/proclet/ProxyStream.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/shell/org/jnode/shell/proclet/ProxyStream.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -23,8 +23,6 @@ import java.io.Closeable; -import org.jnode.shell.proclet.ProxyStreamException; - /** * Proxy streams have an underlying stream and offer methods for getting that * stream. Modified: trunk/shell/src/test/org/jnode/test/shell/Cassowary.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/Cassowary.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/Cassowary.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; + import javax.naming.NameAlreadyBoundException; import javax.naming.NameNotFoundException; import javax.naming.NamingException; Modified: trunk/shell/src/test/org/jnode/test/shell/CompletionInfoTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/CompletionInfoTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/CompletionInfoTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -23,10 +23,10 @@ import java.util.Iterator; import java.util.SortedSet; +import junit.framework.TestCase; + import org.jnode.driver.console.CompletionInfo; -import junit.framework.TestCase; - /** * Test key methods of the CompletionInfo class. * Modified: trunk/shell/src/test/org/jnode/test/shell/CompletionTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/CompletionTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/CompletionTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -20,6 +20,9 @@ */ package org.jnode.test.shell; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.SortedSet; @@ -28,6 +31,8 @@ import javax.naming.NameNotFoundException; import javax.naming.NamingException; +import junit.framework.TestCase; + import org.jnode.driver.console.CompletionInfo; import org.jnode.shell.CommandShell; import org.jnode.shell.DefaultCommandInvoker; @@ -46,12 +51,6 @@ import org.jnode.test.shell.syntax.TestAliasManager; import org.jnode.test.shell.syntax.TestSyntaxManager; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; - -import junit.framework.TestCase; - /** * Test command completion using various interpreters and commands. * Modified: trunk/shell/src/test/org/jnode/test/shell/DeviceManager.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/DeviceManager.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/DeviceManager.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -6,8 +6,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; + import org.apache.log4j.Logger; -import org.jnode.driver.*; +import org.jnode.driver.AbstractDeviceManager; +import org.jnode.driver.Device; +import org.jnode.driver.DeviceFinder; +import org.jnode.driver.DeviceToDriverMapper; +import org.jnode.driver.DriverException; /** * @author Levente S\u00e1ntha Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/AlternativesSyntaxTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/AlternativesSyntaxTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/AlternativesSyntaxTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -33,12 +33,12 @@ import org.jnode.shell.CommandLine.Token; import org.jnode.shell.syntax.AlternativesSyntax; import org.jnode.shell.syntax.Argument; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.FlagArgument; import org.jnode.shell.syntax.IntegerArgument; import org.jnode.shell.syntax.OptionSyntax; import org.jnode.shell.syntax.Syntax; -import org.jnode.shell.syntax.CommandSyntaxException; public class AlternativesSyntaxTest extends TestCase { Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/ArgumentMultiplicityTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/ArgumentMultiplicityTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/ArgumentMultiplicityTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -30,13 +30,12 @@ import org.jnode.shell.Command; import org.jnode.shell.CommandInfo; import org.jnode.shell.CommandLine; -import org.jnode.shell.ShellException; import org.jnode.shell.CommandLine.Token; import org.jnode.shell.syntax.Argument; import org.jnode.shell.syntax.ArgumentSyntax; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.RepeatSyntax; -import org.jnode.shell.syntax.CommandSyntaxException; public class ArgumentMultiplicityTest extends TestCase { Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/ArgumentTypesTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/ArgumentTypesTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/ArgumentTypesTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -30,12 +30,11 @@ import org.jnode.shell.Command; import org.jnode.shell.CommandInfo; import org.jnode.shell.CommandLine; -import org.jnode.shell.ShellException; import org.jnode.shell.CommandLine.Token; import org.jnode.shell.syntax.ArgumentSyntax; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.EnumArgument; import org.jnode.shell.syntax.FileArgument; -import org.jnode.shell.syntax.CommandSyntaxException; public class ArgumentTypesTest extends TestCase { Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/CommandLineTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/CommandLineTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/CommandLineTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -30,7 +30,6 @@ import org.jnode.shell.Command; import org.jnode.shell.CommandInfo; import org.jnode.shell.CommandLine; -import org.jnode.shell.ShellException; import org.jnode.shell.SymbolSource; import org.jnode.shell.CommandLine.Token; import org.jnode.shell.syntax.ArgumentSyntax; Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/MuParserTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/MuParserTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/MuParserTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -23,13 +23,13 @@ import org.jnode.shell.CommandLine; import org.jnode.shell.NoTokensAvailableException; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.MuAlternation; import org.jnode.shell.syntax.MuBackReference; import org.jnode.shell.syntax.MuParser; import org.jnode.shell.syntax.MuSequence; import org.jnode.shell.syntax.MuSymbol; import org.jnode.shell.syntax.MuSyntax; -import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.SyntaxFailureException; @SuppressWarnings("deprecation") Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/MuParserTest2.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/MuParserTest2.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/MuParserTest2.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -29,6 +29,7 @@ import org.jnode.shell.NoTokensAvailableException; import org.jnode.shell.syntax.Argument; import org.jnode.shell.syntax.ArgumentBundle; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.EnumArgument; import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.IntegerArgument; @@ -38,7 +39,6 @@ import org.jnode.shell.syntax.MuParser; import org.jnode.shell.syntax.MuSequence; import org.jnode.shell.syntax.MuSyntax; -import org.jnode.shell.syntax.CommandSyntaxException; @SuppressWarnings("deprecation") public class MuParserTest2 extends TestCase { Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/OptionSetSyntaxTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/OptionSetSyntaxTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/OptionSetSyntaxTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -30,15 +30,14 @@ import org.jnode.shell.Command; import org.jnode.shell.CommandInfo; import org.jnode.shell.CommandLine; -import org.jnode.shell.ShellException; import org.jnode.shell.CommandLine.Token; import org.jnode.shell.syntax.Argument; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.FlagArgument; import org.jnode.shell.syntax.IntegerArgument; import org.jnode.shell.syntax.OptionSetSyntax; import org.jnode.shell.syntax.OptionSyntax; -import org.jnode.shell.syntax.CommandSyntaxException; public class OptionSetSyntaxTest extends TestCase { Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/OptionSyntaxTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/OptionSyntaxTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/OptionSyntaxTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -30,16 +30,15 @@ import org.jnode.shell.Command; import org.jnode.shell.CommandInfo; import org.jnode.shell.CommandLine; -import org.jnode.shell.ShellException; import org.jnode.shell.CommandLine.Token; import org.jnode.shell.syntax.Argument; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.FlagArgument; import org.jnode.shell.syntax.IntegerArgument; import org.jnode.shell.syntax.OptionSyntax; import org.jnode.shell.syntax.RepeatSyntax; import org.jnode.shell.syntax.Syntax; -import org.jnode.shell.syntax.CommandSyntaxException; public class OptionSyntaxTest extends TestCase { Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/PowersetSyntaxTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/PowersetSyntaxTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/PowersetSyntaxTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -30,16 +30,15 @@ import org.jnode.shell.Command; import org.jnode.shell.CommandInfo; import org.jnode.shell.CommandLine; -import org.jnode.shell.ShellException; import org.jnode.shell.CommandLine.Token; import org.jnode.shell.syntax.Argument; import org.jnode.shell.syntax.ArgumentBundle; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.IntegerArgument; import org.jnode.shell.syntax.OptionSyntax; import org.jnode.shell.syntax.PowersetSyntax; import org.jnode.shell.syntax.Syntax; -import org.jnode.shell.syntax.CommandSyntaxException; public class PowersetSyntaxTest extends TestCase { Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/RepeatedSyntaxTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/RepeatedSyntaxTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/RepeatedSyntaxTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -30,14 +30,13 @@ import org.jnode.shell.Command; import org.jnode.shell.CommandInfo; import org.jnode.shell.CommandLine; -import org.jnode.shell.ShellException; import org.jnode.shell.CommandLine.Token; import org.jnode.shell.syntax.Argument; import org.jnode.shell.syntax.ArgumentSyntax; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.RepeatSyntax; import org.jnode.shell.syntax.Syntax; -import org.jnode.shell.syntax.CommandSyntaxException; public class RepeatedSyntaxTest extends TestCase { Modified: trunk/shell/src/test/org/jnode/test/shell/syntax/SequenceSyntaxTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/syntax/SequenceSyntaxTest.java 2008-03-30 02:20:56 UTC (rev 3911) +++ trunk/shell/src/test/org/jnode/test/shell/syntax/SequenceSyntaxTest.java 2008-03-30 02:24:36 UTC (rev 3912) @@ -30,16 +30,15 @@ import org.jnode.shell.Command; import org.jnode.shell.CommandInfo; import org.jnode.shell.CommandLine; -import org.jnode.shell.ShellException; import org.jnode.shell.CommandLine.Token; import org.jnode.shell.syntax.Argument; import org.jnode.shell.syntax.ArgumentSyntax; +import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.IntegerArgument; import org.jnode.shell.syntax.RepeatSyntax; import org.jnode.shell.syntax.SequenceSyntax; import org.jnode.shell.syntax.Syntax; -import org.jnode.shell.syntax.CommandSyntaxException; public class SequenceSyntaxTest extends TestCase { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |