From 80fd150d309bd13424be73392a4bde2c742a185f Mon Sep 17 00:00:00 2001 From: kcr Date: Wed, 8 Feb 2006 22:48:24 +0000 Subject: Merged changes between 1.4.0-beta3 and 1.4.0-beta4 into dev-1_5 --- src/Timer/TimerTest.html | 15 -------- src/Timer/TimerTest.java | 84 ----------------------------------------- src/Timer/TimerTest_plugin.html | 39 ------------------- src/Timer/build.xml | 69 --------------------------------- 4 files changed, 207 deletions(-) delete mode 100644 src/Timer/TimerTest.html delete mode 100644 src/Timer/TimerTest.java delete mode 100644 src/Timer/TimerTest_plugin.html delete mode 100644 src/Timer/build.xml (limited to 'src/Timer') diff --git a/src/Timer/TimerTest.html b/src/Timer/TimerTest.html deleted file mode 100644 index 5da3035..0000000 --- a/src/Timer/TimerTest.html +++ /dev/null @@ -1,15 +0,0 @@ - - -Hello, Universe! - - - -
-
-If you were using a Java-capable browser, -you would see Hello Universe! instead of this paragraph. -
-
-
- - diff --git a/src/Timer/TimerTest.java b/src/Timer/TimerTest.java deleted file mode 100644 index 37f0f7c..0000000 --- a/src/Timer/TimerTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * $RCSfile$ - * - * Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistribution of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistribution in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of Sun Microsystems, Inc. or the names of - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any - * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND - * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY - * EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL - * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF - * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR - * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, - * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND - * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR - * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - * - * You acknowledge that this software is not designed, licensed or - * intended for use in the design, construction, operation or - * maintenance of any nuclear facility. - * - * $Revision$ - * $Date$ - * $State$ - */ - -import java.applet.Applet; -import java.awt.Panel; -import java.awt.TextArea; -import com.sun.j3d.utils.applet.MainFrame; -import com.sun.j3d.utils.timer.J3DTimer; - -public class TimerTest extends Applet { - - long[] ticks = new long[10]; - long[] sysTime = new long[ticks.length]; - - public TimerTest() { - } - - public void init() { - Panel panel = new Panel(); - String header = new String(" J3D Timer System Timer\n"); - TextArea textArea = new TextArea(header, 12, 35, TextArea.SCROLLBARS_NONE ); - panel.add(textArea); - this.add(panel); - - - for(int i=0; i - -Hello, Universe! - - - - - - - - - - -</COMMENT> -<blockquote> -<hr> -If you were using a Java-capable browser, -you would see Hello Universe! instead of this paragraph. -<hr> -</blockquote> - - - - - - - - diff --git a/src/Timer/build.xml b/src/Timer/build.xml deleted file mode 100644 index 4e57328..0000000 --- a/src/Timer/build.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3