--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties Wed May 18 11:38:20 2016 +0530
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties Wed May 18 11:35:10 2016 -0700
@@ -34,7 +34,7 @@
jshell.msg.terminated =\
State engine terminated.\n\
-Restore definitions with: /reload restore
+Restore definitions with: /reload -restore
jshell.msg.use.one.of = Use one of: {0}
jshell.err.def.or.id.not.found = No applicable definition or id found named: {0}
@@ -102,7 +102,7 @@
jshell.err.feedback.expected.new.feedback.mode = Expected new feedback mode -- {0}
jshell.err.feedback.expected.mode.name = Expected a new feedback mode name. ''{0}'' is a known feedback mode -- {1}
-jshell.err.feedback.command.quiet = Specify either ''command'' or ''quiet'' -- {0}
+jshell.err.feedback.command.quiet = Specify either ''-command'' or ''-quiet'' -- {0}
jshell.err.feedback.expected.field = Expected field name missing -- {0}
jshell.err.feedback.expected.mode = Expected a feedback mode -- {0}
jshell.err.feedback.does.not.match.mode = Does not match any current feedback mode: {0} -- {1}
@@ -151,15 +151,15 @@
\ -version Version information\n
help.list.summary = list the source you have typed
-help.list.args = [<name or id>|all|start]
+help.list.args = [<name or id>|-all|-start]
help.list =\
Show the source of snippets, prefaced with the snippet id.\n\
\n\
/list\n\t\
List the currently active snippets of code that you typed or read with /open\n\n\
-/list start\n\t\
+/list -start\n\t\
List the automatically evaluated start-up snippets\n\n\
-/list all\n\t\
+/list -all\n\t\
List all snippets including failed, overwritten, dropped, and start-up\n\n\
/list <name>\n\t\
List snippets with the specified name (preference for active snippets)\n\n\
@@ -191,18 +191,18 @@
Drop the snippet with the specified snippet id
help.save.summary = Save snippet source to a file.
-help.save.args = [all|history|start] <file>
+help.save.args = [-all|-history|-start] <file>
help.save =\
Save the specified snippets and/or commands to the specified file.\n\
\n\
/save <file>\n\t\
Save the source of current active snippets to the file.\n\n\
-/save all <file>\n\t\
+/save -all <file>\n\t\
Save the source of all snippets to the file.\n\t\
Includes source including overwritten, failed, and start-up code.\n\n\
-/save history <file>\n\t\
+/save -history <file>\n\t\
Save the sequential history of all commands and snippets entered since jshell was launched.\n\n\
-/save start <file>\n\t\
+/save -start <file>\n\t\
Save the default start-up definitions to the file.
help.open.summary = open a file as source input
@@ -214,7 +214,7 @@
Read the specified file as jshell input.
help.vars.summary = list the declared variables and their values
-help.vars.args = [<name or id>|all|start]
+help.vars.args = [<name or id>|-all|-start]
help.vars =\
List the type, name, and value of jshell variables.\n\
\n\
@@ -224,13 +224,13 @@
List jshell variables with the specified name (preference for active variables)\n\n\
/vars <id>\n\t\
List the jshell variable with the specified snippet id\n\n\
-/vars start\n\t\
+/vars -start\n\t\
List the automatically added start-up jshell variables\n\n\
-/vars all\n\t\
+/vars -all\n\t\
List all jshell variables including failed, overwritten, dropped, and start-up
help.methods.summary = list the declared methods and their signatures
-help.methods.args = [<name or id>|all|start]
+help.methods.args = [<name or id>|-all|-start]
help.methods =\
List the name, parameter types, and return type of jshell methods.\n\
\n\
@@ -240,13 +240,13 @@
List jshell methods with the specified name (preference for active methods)\n\n\
/methods <id>\n\t\
List the jshell method with the specified snippet id\n\n\
-/methods start\n\t\
+/methods -start\n\t\
List the automatically added start-up jshell methods\n\n\
-/methods all\n\t\
+/methods -all\n\t\
List all snippets including failed, overwritten, dropped, and start-up
help.types.summary = list the declared types
-help.types.args =[<name or id>|all|start]
+help.types.args =[<name or id>|-all|-start]
help.types =\
List jshell classes, interfaces, and enums.\n\
\n\
@@ -256,9 +256,9 @@
List jshell types with the specified name (preference for active types)\n\n\
/types <id>\n\t\
List the jshell type with the specified snippet id\n\n\
-/types start\n\t\
+/types -start\n\t\
List the automatically added start-up jshell types\n\n\
-/types all\n\t\
+/types -all\n\t\
List all jshell types including failed, overwritten, dropped, and start-up
help.imports.summary = list the imported items
@@ -283,8 +283,8 @@
Tool settings are maintained, as set with: /set ...\n\
Save any work before using this command
-help.reload.summary = reset and replay relevant history -- current or previous (restore)
-help.reload.args = [restore] [quiet]
+help.reload.summary = reset and replay relevant history -- current or previous (-restore)
+help.reload.args = [-restore] [-quiet]
help.reload =\
Reset the jshell tool code and execution state then replay each\n\
jshell valid command and valid snippet in the order they were entered.\n\
@@ -293,13 +293,13 @@
Reset and replay the valid history since jshell was entered, or\n\t\
a /reset, or /reload command was executed -- whichever is most\n\t\
recent.\n\n\
-/reload restore\n\t\
+/reload -restore\n\t\
Reset and replay the valid history between the previous and most\n\t\
recent time that jshell was entered, or a /reset, or /reload\n\t\
command was executed. This can thus be used to restore a previous\n\t\
jshell tool sesson.\n\n\
-/reload [restore] quiet\n\t\
- With the 'quiet' argument the replay is not shown. Errors will display.
+/reload [-restore] -quiet\n\t\
+ With the '-quiet' argument the replay is not shown. Errors will display.
help.classpath.summary = add a path to the classpath
help.classpath.args = <path>
@@ -350,7 +350,7 @@
The contents of the specified <file> become the default start-up snippets and commands.\n\n\
/set feedback <mode>\n\t\
Set the feedback mode describing displayed feedback for entered snippets and commands.\n\n\
-/set newmode <new-mode> [command|quiet [<old-mode>]]\n\t\
+/set newmode <new-mode> [-command|-quiet [<old-mode>]]\n\t\
Create a user-defined feedback mode, optionally copying from an existing mode.\n\n\
/set prompt <mode> "<prompt>" "<continuation-prompt>"\n\t\
Set the displayed prompts for a given feedback mode.\n\n\
@@ -544,12 +544,12 @@
help.set.newmode = \
Create a user-defined feedback mode, optionally copying from an existing mode.\n\
\n\t\
-/set newmode <new-mode> [command|quiet [<old-mode>]]\n\
+/set newmode <new-mode> [-command|-quiet [<old-mode>]]\n\
\n\
Where <new-mode> is the name of a mode you wish to create.\n\
Where <old-mode> is the name of a previously defined feedback mode.\n\
If <old-mode> is present, its settings are copied to the new mode.\n\
-'command' vs 'quiet' determines if informative/verifying command feedback is displayed.\n\
+'-command' vs '-quiet' determines if informative/verifying command feedback is displayed.\n\
\n\
Once the new mode is created, use '/set format' and '/set prompt' to configure it.\n\
Use '/set feedback' to use the new mode.\n\
@@ -583,7 +583,7 @@
which are run when the jshell tool is started or reset.
startup.feedback = \
-/set newmode verbose command \n\
+/set newmode verbose -command \n\
\n\
/set prompt verbose '\\njshell> ' ' ...> ' \n\
\n\
@@ -650,11 +650,11 @@
/set truncation verbose 80\n\
/set truncation verbose 500 varvalue\n\
\n\
-/set newmode normal command verbose \n\
+/set newmode normal -command verbose \n\
/set format normal display '' added,modified,replaced,overwrote,dropped-update \n\
/set format normal display '{pre}{action} variable {name}, reset to null{post}' replaced-vardecl,varinit-ok-update \n\
/set format normal display '{result}' added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary \n\
-/set newmode concise quiet normal \n\
+/set newmode concise -quiet normal \n\
\n\
/set prompt concise 'jshell> ' ' ...> ' \n\
\n\
@@ -662,7 +662,7 @@
\n\
/set feedback normal \n\
\n\
-/set newmode silent quiet \n\
+/set newmode silent -quiet \n\
/set prompt silent '-> ' '>> ' \n\
/set format silent pre '| ' \n\
/set format silent post '%n' \n\