diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-06-27 20:01:40 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-06-27 20:01:40 +0000 |
| commit | 3b00aa20227be4b0f2314278dcea3ef3739c44aa (patch) | |
| tree | f7d11ad3bf3342c619595f748dbb91b184b8324c /tools | |
| parent | 78c2fbfb5f722402791ad87028a3a5f62ed4c086 (diff) | |
| download | classpath-3b00aa20227be4b0f2314278dcea3ef3739c44aa.tar.gz | |
2006-06-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD --> generics-branch for 2006/06/16
to 2006/06/27.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/.cvsignore | 3 | ||||
| -rw-r--r-- | tools/gnu/classpath/tools/getopt/Parser.java | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tools/.cvsignore b/tools/.cvsignore index 141547731..d2e24c413 100644 --- a/tools/.cvsignore +++ b/tools/.cvsignore @@ -5,3 +5,6 @@ Makefile tools.zip appletviewer .deps +gappletviewer +gjarsigner +gkeytool diff --git a/tools/gnu/classpath/tools/getopt/Parser.java b/tools/gnu/classpath/tools/getopt/Parser.java index 082cf8945..3c6cf6f46 100644 --- a/tools/gnu/classpath/tools/getopt/Parser.java +++ b/tools/gnu/classpath/tools/getopt/Parser.java @@ -316,6 +316,9 @@ public class Parser int eq = option.indexOf('='); if (eq != - 1) justName = option.substring(0, eq); + char shortName = 0; + if (justName.length() == 1) + shortName = justName.charAt(0); Option found = null; for (int i = options.size() - 1; i >= 0; --i) { @@ -325,6 +328,11 @@ public class Parser found = opt; break; } + if (shortName != 0 && opt.getShortName() == shortName) + { + found = opt; + break; + } } if (found == null) { |