Permalink
Browse files

* bumped source and target version to 1.5

* style cleanup
  • Loading branch information...
1 parent 08d5815 commit 851b8f67435de9b6185c71c06262293e825fb87c @neurolabs committed May 3, 2009
Showing with 7,959 additions and 7,370 deletions.
  1. +1 −1 build.xml
  2. +51 −36 src/henplus/AbstractCommand.java
  3. +30 −12 src/henplus/AbstractOutputDevice.java
  4. +138 −134 src/henplus/Command.java
  5. +263 −248 src/henplus/CommandDispatcher.java
  6. +18 −17 src/henplus/EchoCommandProperty.java
  7. +449 −469 src/henplus/HenPlus.java
  8. +62 −62 src/henplus/HistoryWriter.java
  9. +3 −5 src/henplus/Interruptable.java
  10. +7 −1 src/henplus/OutputDevice.java
  11. +17 −19 src/henplus/PasswordEraserThread.java
  12. +31 −11 src/henplus/PrintStreamOutputDevice.java
  13. +31 −29 src/henplus/PropertyRegistry.java
  14. +7 −7 src/henplus/SQLMetaData.java
  15. +95 −95 src/henplus/SQLMetaDataBuilder.java
  16. +225 −226 src/henplus/SQLSession.java
  17. +330 −293 src/henplus/SQLStatementSeparator.java
  18. +33 −28 src/henplus/SamplePlugin.java
  19. +50 −48 src/henplus/SessionManager.java
  20. +42 −37 src/henplus/SigIntHandler.java
  21. +14 −9 src/henplus/TerminalOutputDevice.java
  22. +43 −42 src/henplus/commands/AboutCommand.java
  23. +227 −230 src/henplus/commands/AliasCommand.java
  24. +45 −50 src/henplus/commands/CommandTokenizer.java
  25. +319 −314 src/henplus/commands/ConnectCommand.java
  26. +180 −133 src/henplus/commands/DescribeCommand.java
  27. +210 −191 src/henplus/commands/DriverCommand.java
  28. +710 −653 src/henplus/commands/DumpCommand.java
  29. +30 −29 src/henplus/commands/EchoCommand.java
  30. +18 −17 src/henplus/commands/ExitCommand.java
  31. +19 −20 src/henplus/commands/ExportCommand.java
  32. +48 −47 src/henplus/commands/FileCompletionIterator.java
  33. +125 −108 src/henplus/commands/HelpCommand.java
  34. +317 −255 src/henplus/commands/ImportCommand.java
  35. +121 −122 src/henplus/commands/KeyBindCommand.java
  36. +173 −172 src/henplus/commands/ListUserObjectsCommand.java
  37. +122 −119 src/henplus/commands/LoadCommand.java
  38. +17 −17 src/henplus/commands/LongRunningTimeDisplay.java
  39. +178 −164 src/henplus/commands/PluginCommand.java
  40. +100 −108 src/henplus/commands/ResultSetRenderer.java
  41. +425 −419 src/henplus/commands/SQLCommand.java
  42. +173 −181 src/henplus/commands/SetCommand.java
  43. +143 −138 src/henplus/commands/ShellCommand.java
  44. +61 −55 src/henplus/commands/SpoolCommand.java
  45. +13 −12 src/henplus/commands/StatementCanceller.java
  46. +12 −15 src/henplus/commands/StatusCommand.java
  47. +83 −63 src/henplus/commands/SystemInfoCommand.java
  48. +72 −62 src/henplus/commands/TimeRenderer.java
  49. +191 −177 src/henplus/commands/TreeCommand.java
  50. +140 −142 src/henplus/commands/properties/AbstractPropertyCommand.java
  51. +31 −25 src/henplus/commands/properties/PropertyCommand.java
  52. +19 −12 src/henplus/commands/properties/SessionPropertyCommand.java
  53. +2 −2 src/henplus/event/ExecutionListener.java
  54. +3 −2 src/henplus/importparser/IgnoreTypeParser.java
  55. +60 −57 src/henplus/importparser/ImportParser.java
  56. +8 −10 src/henplus/importparser/QuotedStringParser.java
  57. +7 −7 src/henplus/importparser/StringParser.java
  58. +3 −4 src/henplus/importparser/TypeParser.java
  59. +6 −6 src/henplus/importparser/ValueRecipient.java
  60. +68 −65 src/henplus/io/ConfigurationContainer.java
  61. +159 −134 src/henplus/plugins/tablediff/ResultTablePrinter.java
  62. +330 −277 src/henplus/plugins/tablediff/TableDiffCommand.java
  63. +31 −24 src/henplus/plugins/tablediff/TableDiffResult.java
  64. +40 −27 src/henplus/plugins/tablediff/TableDiffer.java
  65. +14 −16 src/henplus/property/BooleanPropertyHolder.java
  66. +39 −35 src/henplus/property/EnumeratedPropertyHolder.java
  67. +52 −57 src/henplus/property/PropertyHolder.java
  68. +75 −67 src/henplus/sqlmodel/Column.java
  69. +42 −29 src/henplus/sqlmodel/ColumnFkInfo.java
  70. +20 −14 src/henplus/sqlmodel/ColumnPkInfo.java
  71. +34 −34 src/henplus/sqlmodel/PrimaryKey.java
  72. +66 −63 src/henplus/sqlmodel/Table.java
  73. +181 −163 src/henplus/util/DependencyResolver.java
  74. +62 −39 src/henplus/util/ListMap.java
  75. +21 −18 src/henplus/util/StringAppender.java
  76. +37 −42 src/henplus/view/Column.java
  77. +53 −39 src/henplus/view/ColumnMetaData.java
  78. +24 −20 src/henplus/view/ExtendedColumn.java
  79. +66 −56 src/henplus/view/ExtendedTableRenderer.java
  80. +46 −56 src/henplus/view/TableRenderer.java
  81. +38 −34 src/henplus/view/util/CancelWriter.java
  82. +11 −8 src/henplus/view/util/Formatter.java
  83. +37 −37 src/henplus/view/util/NameCompleter.java
  84. +18 −15 src/henplus/view/util/ProgressWriter.java
  85. +44 −34 src/henplus/view/util/SortedMatchIterator.java
View
@@ -62,7 +62,7 @@
<target name="compile" depends="prepare,Version.java"
description="compile it">
- <javac debug="true" source="1.3" target="1.3"
+ <javac debug="true" source="1.5" target="1.5"
encoding="ISO-8859-1" srcdir="${src}" destdir="${classes}">
<classpath refid="compile.classpath" />
</javac>
@@ -14,72 +14,87 @@
import org.apache.commons.cli.Options;
/**
- * Implementation of a Command with default settings. Override
- * what is necessary in your Command. It makes sense to derive plug-ins
- * from this AbstractCommand - this makes the plug-in more robust
- * with regard to newly added methods.
+ * Implementation of a Command with default settings. Override what is necessary
+ * in your Command. It makes sense to derive plug-ins from this AbstractCommand
+ * - this makes the plug-in more robust with regard to newly added methods.
+ *
* @author Henner Zeller
*/
public abstract class AbstractCommand implements Command {
-
+
private Options options;
-
+
// no description by default.
- public String getShortDescription() { return null; }
- public String getLongDescription(String cmd) { return null; }
- public String getSynopsis(String cmd) { return null; }
-
+ public String getShortDescription() {
+ return null;
+ }
+
+ public String getLongDescription(final String cmd) {
+ return null;
+ }
+
+ public String getSynopsis(final String cmd) {
+ return null;
+ }
+
// All commands are completed by default.
- public boolean participateInCommandCompletion() { return true; }
+ public boolean participateInCommandCompletion() {
+ return true;
+ }
// no completion support by the commmand
- public Iterator complete(CommandDispatcher disp,
- String partialCommand, String lastWord) {
- return null;
+ public Iterator complete(final CommandDispatcher disp, final String partialCommand,
+ final String lastWord) {
+ return null;
+ }
+
+ public void shutdown() { /* don't care */
}
-
- public void shutdown() { /* don't care */ }
// the simple commands are always complete on newline or semicolon
- public boolean isComplete(String command) { return true; }
+ public boolean isComplete(final String command) {
+ return true;
+ }
- public boolean requiresValidSession(String cmd) { return true; }
+ public boolean requiresValidSession(final String cmd) {
+ return true;
+ }
/**
- * convenience method: returns the number of elements in this
- * string, separated by whitespace.
+ * convenience method: returns the number of elements in this string,
+ * separated by whitespace.
*/
- protected int argumentCount(String command) {
- return (new StringTokenizer(command)).countTokens();
+ protected int argumentCount(final String command) {
+ return new StringTokenizer(command).countTokens();
}
-
-
+
protected Options getOptions() {
return options;
}
- public void setOptions(Options options) {
+
+ public void setOptions(final Options options) {
this.options = options;
}
- public Option getOption(String arg0) {
+
+ public Option getOption(final String arg0) {
return options.getOption(arg0);
}
-
+
/**
* Override this method if you want to register command-specific options
+ *
* @param r
*/
- public void registerOptions(Options r){
-
+ public void registerOptions(final Options r) {
+
}
-
- public void handleCommandline(CommandLine line){
-
+
+ public void handleCommandline(final CommandLine line) {
+
}
}
/*
- * Local variables:
- * c-basic-offset: 4
- * compile-command: "ant -emacs -find build.xml"
- * End:
+ * Local variables: c-basic-offset: 4 compile-command:
+ * "ant -emacs -find build.xml" End:
*/
@@ -10,16 +10,34 @@
* An OutputDevice that does nothing.
*/
public abstract class AbstractOutputDevice implements OutputDevice {
- public void flush() { }
- public void write(byte[] buffer, int off, int len) { }
- public void print(String s) { }
- public void println(String s) { }
- public void println() { }
-
- public void attributeBold() { }
- public void attributeReset() { }
- public void attributeGrey() { }
-
- public void close() { }
- public boolean isTerminal() { return false; }
+ public void flush() {
+ }
+
+ public void write(final byte[] buffer, final int off, final int len) {
+ }
+
+ public void print(final String s) {
+ }
+
+ public void println(final String s) {
+ }
+
+ public void println() {
+ }
+
+ public void attributeBold() {
+ }
+
+ public void attributeReset() {
+ }
+
+ public void attributeGrey() {
+ }
+
+ public void close() {
+ }
+
+ public boolean isTerminal() {
+ return false;
+ }
}
Oops, something went wrong.

0 comments on commit 851b8f6

Please sign in to comment.