diff options
| -rw-r--r-- | libjava/ChangeLog | 12 | ||||
| -rw-r--r-- | libjava/gnu/gcj/convert/Convert.java | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/rmi/registry/RegistryImpl.java | 28 | ||||
| -rw-r--r-- | libjava/gnu/java/rmi/rmic/RMIC.java | 2 |
4 files changed, 41 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ae7ea57f8fd..16b672e874c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,17 @@ 2002-03-25 Tom Tromey <tromey@redhat.com> + For PR libgcj/5303: + * gnu/java/rmi/registry/RegistryImpl.java (main): Recognize --help + and --version. + (help): New method. + (version): Likewise. + * gnu/gcj/convert/Convert.java (version): Removed extraneous + "GNU". + * gnu/java/rmi/rmic/RMIC.java (parseOptions): Removed extraneous + "GNU". + +2002-03-25 Tom Tromey <tromey@redhat.com> + * java/awt/Component.java (processEvent): Check ComponentEvent after KeyEvent. diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java index 820fe14a9f3..d16adc13014 100644 --- a/libjava/gnu/gcj/convert/Convert.java +++ b/libjava/gnu/gcj/convert/Convert.java @@ -40,7 +40,7 @@ public class Convert static void version () { - System.out.println("jv-convert (GNU " + System.out.println("jv-convert (" + System.getProperty("java.vm.name") + ") " + System.getProperty("java.vm.version")); diff --git a/libjava/gnu/java/rmi/registry/RegistryImpl.java b/libjava/gnu/java/rmi/registry/RegistryImpl.java index b38ee5cab15..fdf4506f32d 100644 --- a/libjava/gnu/java/rmi/registry/RegistryImpl.java +++ b/libjava/gnu/java/rmi/registry/RegistryImpl.java @@ -1,5 +1,5 @@ /* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -103,9 +103,35 @@ public String[] list() throws RemoteException, AccessException { return (strings); } +public static void version() { + System.out.println("rmiregistry (" + + System.getProperty("java.vm.name") + + ") " + + System.getProperty("java.vm.version")); + System.out.println("Copyright 2002 Free Software Foundation, Inc."); + System.out.println("This is free software; see the source for copying conditions. There is NO"); + System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."); + System.exit(0); +} + +public static void help() { + System.out.println( +"Usage: rmiregistry [OPTION | PORT]\n" + +"\n" + +" --help Print this help, then exit\n" + +" --version Print version number, then exit\n"); + System.exit(0); +} + public static void main(String[] args) { int port = Registry.REGISTRY_PORT; if (args.length > 0) { + if (args[0].equals("--version")) { + version(); + } + else if (args[0].equals("--help")) { + help(); + } try { port = Integer.parseInt(args[0]); } diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java index f3ff128f2a4..ef4473247d6 100644 --- a/libjava/gnu/java/rmi/rmic/RMIC.java +++ b/libjava/gnu/java/rmi/rmic/RMIC.java @@ -939,7 +939,7 @@ private void parseOptions() { usage(); } else if (arg.equals("-version")) { - System.out.println("rmic (GNU " + System.out.println("rmic (" + System.getProperty("java.vm.name") + ") " + System.getProperty("java.vm.version")); |