Mercurial > hg > testrepo
changeset 22:395985c94a9b
Merge world feature branch into mainline.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Mon, 01 Sep 2008 10:22:55 +0200 |
| parents | aae2170dd021 (current diff) ccdbfa9c59e3 (diff) |
| children | 72048c944edb |
| files | ChangeLog Hello.java HelloWorld.java World.java |
| diffstat | 4 files changed, 36 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Aug 08 11:17:22 2008 -0400 +++ b/ChangeLog Mon Sep 01 10:22:55 2008 +0200 @@ -35,6 +35,12 @@ * Makefile: New file. +2007-09-09 Mark Wielaard <mark@klomp.org> + + * HelloWorld.java: Deleted, split into... + * Hello.java: New class. + * World.java: New class. + 2007-09-05 Christian Thalinger <twisti@complang.tuwien.ac.at> * ChangeLog: Am I able to push?
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Hello.java Mon Sep 01 10:22:55 2008 +0200 @@ -0,0 +1,17 @@ +public class Hello +{ + public static void main (String[] args) + { + Hello.hello(); + + System.out.println (); + + World.world(); + } + + static void hello() + { + System.out.println ("Hello World!"); + System.out.println ("Greetings Earth!"); + } +}
--- a/HelloWorld.java Fri Aug 08 11:17:22 2008 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -public class HelloWorld -{ - public static void main (String[] args) - { - System.out.println ("Hello World!"); - - System.out.println (); - - String classpathVersion = System.getProperty("gnu.classpath.version"); - System.out.println ("vm: " + System.getProperty("java.vm.name") + - (classpathVersion != null ? " running on GNU Classpath " + - classpathVersion : "")); - System.out.println ("version: " + System.getProperty("java.vm.version")); - System.out.println ("vendor: " + System.getProperty("java.vm.vendor")); - } -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/World.java Mon Sep 01 10:22:55 2008 +0200 @@ -0,0 +1,13 @@ +public class World +{ + static void world() + { + String classpathVersion = System.getProperty("gnu.classpath.version"); + System.out.println ("vm: " + System.getProperty("java.vm.name") + + (classpathVersion != null + ? " running on GNU Classpath " + + classpathVersion : "")); + System.out.println ("version: " + System.getProperty("java.vm.version")); + System.out.println ("vendor: " + System.getProperty("java.vm.vendor")); + } +}