aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Kearns <dkearns@users.sourceforge.net>2003-08-19 12:52:08 +0000
committerDoug Kearns <dkearns@users.sourceforge.net>2003-08-19 12:52:08 +0000
commit564504c1d641af1629737beb9456f59636375fe9 (patch)
treeb7c9a67aedb2b3a849b547b8c7afd849d6c7a20c
parent770c5da67f3c0fb69070f7ad6884934658f85466 (diff)
downloadzsh-564504c1d641af1629737beb9456f59636375fe9.tar.gz
zsh-564504c1d641af1629737beb9456f59636375fe9.tar.xz
zsh-564504c1d641af1629737beb9456f59636375fe9.zip
18872: update javac completion for SDK 1.4.x and rename serialvar to serialver
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/.distfiles2
-rw-r--r--Completion/Unix/Command/_java29
3 files changed, 22 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index f259ca4c3..55d2acc0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,11 @@
* 18877: Etc/completion-style-guide: add a few more points
+2003-07-21 Doug Kearns <djkea2@mugca.its.monash.edu.au>
+
+ * 18872: Completion/Unix/Command/_java: update javac completion for
+ SDK 1.4.x and rename serialvar to serialver
+
2003-07-17 Oliver Kiddle <opk@zsh.org>
* 18866: Etc/completion-style-guide: document conventions used
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index 531544e4b..a5d32f8cd 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -19,5 +19,5 @@ _user_admin _rsync _arping _spamassassin _mtools _fsh
_chkconfig _cdcd _irssi _sccs _texinfo _ant
_global _global_tags _figlet _ifconfig _last _larch
_lsof _mt _xmlsoft _elinks _tidy _python
-_antiword _renice _sablotron _cdrecord
+_antiword _renice _sablotron _cdrecord _aap
'
diff --git a/Completion/Unix/Command/_java b/Completion/Unix/Command/_java
index 76f3358b1..9c5d3688f 100644
--- a/Completion/Unix/Command/_java
+++ b/Completion/Unix/Command/_java
@@ -1,4 +1,4 @@
-#compdef javac java javadoc appletviewer jar jdb javah javap extcheck rmic rmiregistry rmid serialvar native2ascii keytool jarsigner policytool
+#compdef javac java javadoc appletviewer jar jdb javah javap extcheck rmic rmiregistry rmid serialver native2ascii keytool jarsigner policytool
local expl tmp jdb_args jar_cmd match basedir ret=1
local curcontext="$curcontext" state line jf
@@ -10,17 +10,18 @@ case "$service" in
javac)
_arguments -C \
'-g-[generate debugging information]:debug:->debug' \
- '-O[optimize]' \
- '-nowarn[suppress warnings]' \
- '-verbose[print verbose messages]' \
- '-deprecation[print uses of deprecated APIs]' \
- '-classpath[specify path for user class files]:class path:->classpath' \
- '-sourcepath[specify path for source files]:source path:->sourcepath' \
- '-bootclasspath[specify path for bootstrap class files]:bootstrap class path:->bootstrapclasspath' \
- '-extdirs[specify directories for extensions]:extensions directories:->extdirs' \
- '-d[specify destination directory]:directory:_files -/' \
- '-encoding[specify character encoding for source files]:encoding:->encoding' \
+ '-nowarn[generate no warnings]' \
+ '-verbose[output messages about what the compiler is doing]' \
+ '-deprecation[output source locations where deprecated APIs are used]' \
+ '-classpath[specify where to find user class files]:class path:->classpath' \
+ '-sourcepath[specify where to find input source files]:source path:->sourcepath' \
+ '-bootclasspath[override location of bootstrap class files]:bootstrap class path:->bootstrapclasspath' \
+ '-extdirs[override location of installed extensions]:extensions directories:->extdirs' \
+ '-d[specify where to place generated class files]:directory:_files -/' \
+ '-encoding[specify character encoding used by source files]:encoding:->encoding' \
+ '-source[provide source compatibility with specified release]:release:(1.3 1.4)' \
'-target[specify VM version]:release:(1.{1..4})' \
+ '-help[print a synopsis of standard options]' \
'*:java source file:_files -g \*.java' && return 0
;;
@@ -201,9 +202,11 @@ rmid)
'-stop[stop rmid]:' && return 0
;;
-serialvar)
+serialver)
_arguments \
- '-show[display user interface]' && return 0
+ '-classpath[specify where to find user class files]:class path:->classpath' \
+ '(*)-show[display user interface]' \
+ '(-show)*:class:_java_class ${(kv)opt_args[(i)-classpath]}' && return 0
;;
native2ascii)