You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2014/03/18 22:10:44 UTC
git commit: Revert "SQOOP-1233. Remove unnecessary explicit call to
MessageFormat."
Repository: sqoop
Updated Branches:
refs/heads/sqoop2 0eb235241 -> 8e978c042
Revert "SQOOP-1233. Remove unnecessary explicit call to MessageFormat."
This reverts commit f3a2c576ed3cc54745489cdabadd8c3c35782911.
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/8e978c04
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/8e978c04
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/8e978c04
Branch: refs/heads/sqoop2
Commit: 8e978c0423e83d8d6989abf03743f1e7e1fa88ba
Parents: 0eb2352
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Tue Mar 18 14:07:13 2014 -0700
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Tue Mar 18 14:07:13 2014 -0700
----------------------------------------------------------------------
shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java | 8 ++++++--
.../main/java/org/apache/sqoop/shell/ShellEnvironment.java | 5 +++--
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/8e978c04/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java b/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java
index 3921b10..e8d531f 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java
@@ -107,8 +107,12 @@ public class HelpCommand extends CommandSupport {
String description = command.getDescription();
- print(" ");
- println(resource.getString(Constants.RES_HELP_CMD_DESCRIPTION), paddedName, paddedShortcut, description);
+ StringBuilder sb = new StringBuilder();
+ sb.append(" ")
+ .append(MessageFormat.format(resource.getString(Constants
+ .RES_HELP_CMD_DESCRIPTION), paddedName,
+ paddedShortcut, description));
+ println(sb.toString());
}
println();
http://git-wip-us.apache.org/repos/asf/sqoop/blob/8e978c04/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java b/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java
index e0924c1..8be2e54 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java
@@ -25,6 +25,7 @@ import org.codehaus.groovy.tools.shell.IO;
import java.net.MalformedURLException;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -173,11 +174,11 @@ public final class ShellEnvironment {
}
public static void printlnResource(String resourceName, Object... values) {
- io.out.printf(resourceString(resourceName), values);
+ io.out.println(MessageFormat.format(resourceString(resourceName), values));
}
public static void println(String str, Object ... values) {
- io.out.printf(str, values);
+ io.out.println(MessageFormat.format(str, values));
}
public static void println(String str) {