- added -argfile

- removed "-d none" as unimplemented
- added -Xlint variants
- Note difference from 1.1 changes doc
  from: "-XLintfile:foo"
    to: "-XLinefile foo"
  per implementation
- re-aligned and cleaned up wording

To keep alignment, prefix each line with \t but
do alignment with spaces only (and don't edit with
editor that replaces spaces with tabs).

1 files changed, 68 insertions, 48 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
index 459c671b7..222577b43 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
@@ -1,56 +1,76 @@
+-Xlint:ignore,error,warning will set the level for all Xlint warnings. -Xlint, alone, is an abbreviation for
+     -Xlint:warning.
 
+     The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see
+     org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. 
 ### AspectJ-specific messages
 configure.version = AspectJ Compiler 1.1
 configure.directoryNotExist = invalid option or directory does not exist: {0}
-
+## 3456789012345678901234567890123456789012345678901234567890123456789012345
 ### miscellaneous
-misc.usage = AspectJ Compiler 1.1\n\n\
-		Usage: <options> <source files | directories>\n\n\
-		AspectJ-specific options:\n\
-		-Xlint			generate crosscutting-specific warnings\n\
-		-injars  		<jar 1>;<jar 2>;...;<jar P>\n\
-		-outjar	<file>		generate a single JAR instead of multiple .class files\n\
-		-incremental		persistant incremental compiler, requires -sourceroots\n\
-		-sourceroots <dir>	find and build all source files under <dir>;<dir 2>;...\n\
-		-emacssym		generate .ajesym symbol files for emacs support\n\n\
-		Standard Eclipse compiler options:\n\
-		-help			display this help message\n\
-		-version		compiler version number\n\
-		-classpath		<dir 1>;<dir 2>;...;<dir P>\n\
-		-d <dir>		destination dir (if omitted no pkg structure created)\n\
-		   \t-d none			no classfile is generated\n\
-		-target <ver>		classfile target setting (1.1 or 1.2, default is 1.1)\n\
-		-1.3 			set compliance level to 1.3 (default)\n\
-		-1.4 			set compliance level to 1.4\n\
-		-source <ver>		assertions toggle (1.3 or 1.4, default is 1.3 \n\t\t\tin -1.3 mode and 1.4 in -1.4 mode)\n\
-		-nowarn			no warning (equivalent to ''-warn:none'')\n\
-		-warn: <level>		set warning level (eg ''-warn:unusedLocals,deprecation'')\n\
-		\tconstructorName		warn method with constructor name\n\
-		\tpackageDefaultMethod	warn attempt to override package-default method\n\
-		\tdeprecation		warn usage of deprecated type or member\n\
-		\tmaskedCatchBlocks	warn hidden catch block\n\
-		\tunusedLocals		warn on unused local variable (never read)\n\
-		\tunusedArguments		warn on unused method argument (never read)\n\
-		\tunusedImports		warn on unused imports\n\
-		\tsyntheticAccess		warn when performing synthetic access \n\t\t\t\tfor innerclass\n\
-		\tassertIdentifier	warn occurrence of ''assert'' used as identifier\n\
-		-deprecation		equivalent to -warn:deprecation.\n\
-		-g[:<level>]		debug attributes level\n\
-			\t-g			all debug info (''-g:lines,vars,source'')\n\
-			\t-g:none			no debug info\n\
-			\t-g:[lines,vars,source]	selective debug info\n\
-		-preserveAllLocals	code gen preserve all local variables (for debug)\n\
-		-noImportError		no errors for unresolved imports\n\
-		-encoding		specify default source encoding format (custom encoding\n\t\t\tcan also be specifed on\
-		a per file basis by suffixing\n\t\t\teach input source file/folder name with '[encoding]')\n\
-		-log <filename>		specify a log file\n\
-		-proceedOnError		keep compiling when error, dumping class files with\n\t\t\tproblem methods\n\
-		-verbose		print accessed/processed compilation units \n\
-		-referenceInfo		compute reference info\n\
-		-progress		show progress (only in -log mode)\n\
-		-time			display speed information\n\
-		-noExit			do not call System.exit(n) at end of compilation\n\t\t\t(n=0 if no error)\n\
-		-repeat <n>		repeat compilation process <n> times (perf analysis)\n
+misc.usage = AspectJ Compiler 1.1\n\
+\n\
+\tUsage: <options> <source files | directories>\n\
+\n\
+AspectJ-specific options:\n\
+\t-injars <jarList>   use classes in <jarList> zip files as source\n\
+\t                    (<jarList> uses classpath delimiter)\n\
+\t-outjar <file>      put output classes in zip file <file>\n\
+\t-argfile <file>     specify line-delimited list of source files\n\
+\t-incremental        continuously-running compiler, needs -sourceroots\n\
+\t                    (reads stdin: enter to recompile and ''q'' to quit)\n\
+\t-sourceroots <dirs> compile all .aj and .java files in <dirs>\n\
+\t                    (<dirs> uses classpath delimiter)\n\
+\t-emacssym           generate .ajesym symbol files for emacs support\n\
+\t-Xlint              same as ''-Xlint:warning''\n\
+\t-Xlint:<level>      set default level for crosscutting messages\n\
+\t                    (<level> may be ignore, warning, or error)\n\
+\t-Xlintfile <file>   specify properties file to set per-message levels\n\
+\t                    (cf org/aspectj/weaver/XlintDefault.properties)\n\
+\n\
+Standard Eclipse compiler options:\n\
+\t-help               emit this help message and quit\n\
+\t-version            emit compiler version number and quit\n\
+\t-classpath <list>   directories and zip files for the classpath\n\
+\t                    (<list> uses platform-specific path delimiter)\n\
+\t-d <dir>            destination directory for output classes \n\
+\t-target <ver>       classfile setting (1.1 or 1.2, default is 1.1)\n\
+\t-1.3                set compliance level to 1.3 (default)\n\
+\t-1.4                set compliance level to 1.4\n\
+\t-source <ver>       assertions toggle (1.3 or 1.4, default is 1.3\n\
+\t                    in -1.3 mode and 1.4 in -1.4 mode)\n\
+\t-nowarn             emit no warnings (same as ''-warn:none'')\n\
+\t-warn:<list>        emit warnings specified by comma-delimited list\n\
+\t                    (eg ''-warn:unusedLocals,deprecation'')\n\
+\t  constructorName       method with constructor name\n\
+\t  packageDefaultMethod  attempt to override package-default method\n\
+\t  deprecation           usage of deprecated type or member\n\
+\t  maskedCatchBlocks     hidden catch block\n\
+\t  unusedLocals          unused local variable (never read)\n\
+\t  unusedArguments       unused method argument (never read)\n\
+\t  unusedImports         unused imports\n\
+\t  syntheticAccess       performing synthetic access for inner classes\n\
+\t  assertIdentifier      ''assert'' used as identifier\n\
+\t-deprecation        same as ''-warn:deprecation''\n\
+\t-noImportError      emit no errors for unresolved imports\n\
+\t-proceedOnError     keep compiling after errors, dumping class files\n\
+\t                    with problem methods\n\
+\t-g[:<level>]        debug attributes level\n\
+\t	-g                  all debug info (same as ''-g:lines,vars,source'')\n\
+\t	-g:none             no debug info\n\
+\t	-g:<items>          debug info for any/all of [lines, vars, source]\n\
+\t-preserveAllLocals  code gen preserve all local variables (for debug)\n\
+\t-referenceInfo      compute reference info\n\
+\t-encoding <name>    specify default source encoding format\n\
+\t                    (Specify encoding for any source file/folder by\n\
+\t                    suffixing each input name with '[encoding]')\n\
+\t-verbose            emit accessed/processed compilation units \n\
+\t-log <filename>     specify a log file for compile messages\n\
+\t-progress           show progress (requires -log mode)\n\
+\t-time               display speed information\n\
+\t-noExit             do not call System.exit(n) at end of compilation\n\
+\t                    (n=0 if no error)\n\
+\t-repeat <n>         repeat compilation process <n> times (perf analysis)\n
 
 ##########################################
 ### JavaBatchCompiler messages.