bodewig 2003/02/06 03:48:00
Modified: . WHATSNEW build.xml
src/main/org/apache/tools/ant/taskdefs/optional/splash
SplashScreen.java
Added: src/testcases/org/apache/tools/ant/taskdefs/optional/splash
SplashScreenTest.java
Log:
Make sure the splash screen disappears when the build is finished.
PR: 16818
Revision Changes Path
1.353 +2 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- WHATSNEW 5 Feb 2003 10:43:07 -0000 1.352
+++ WHATSNEW 6 Feb 2003 11:47:57 -0000 1.353
@@ -120,6 +120,8 @@
execution dir relative executable. The resolveExecutable must be used to
pick up such executables.
+* splash screen would disppear when build was finished.
+
Other changes:
--------------
* The filesetmanifest attribute of <jar> has been reenabled.
1.348 +2 -1 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- build.xml 28 Jan 2003 11:36:38 -0000 1.347
+++ build.xml 6 Feb 2003 11:47:58 -0000 1.348
@@ -1516,8 +1516,9 @@
<exclude name="org/example/**"/>
<exclude name="${ant.package}/taskdefs/TaskdefTest*Task.java"/>
- <!-- interactive test -->
+ <!-- interactive tests -->
<exclude name="${ant.package}/taskdefs/TestProcess.java"/>
+ <exclude name="${optional.package}/splash/SplashScreenTest.java"/>
<!-- only run these tests if their required libraries are
installed -->
1.5 +6 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java
Index: SplashScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SplashScreen.java 25 Jul 2002 15:21:20 -0000 1.4
+++ SplashScreen.java 6 Feb 2003 11:48:00 -0000 1.5
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -139,7 +139,11 @@
}
public void buildStarted(BuildEvent event){ actionPerformed(null);}
- public void buildFinished(BuildEvent event){actionPerformed(null);}
+ public void buildFinished(BuildEvent event){
+ pb.setValue(max);
+ setVisible(false);
+ dispose();
+ }
public void targetStarted(BuildEvent event){actionPerformed(null);}
public void targetFinished(BuildEvent event){actionPerformed(null);}
public void taskStarted(BuildEvent event){actionPerformed(null);}
1.1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java
Index: SplashScreenTest.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions 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.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.tools.ant.taskdefs.optional.splash;
import org.apache.tools.ant.Project;
/**
* This is an "interactive" test, it passes if the splash screen
* disappears after the "finished" but before the "exiting" message.
*
* This even isn't a JUnit test case.
*
* @since Ant 1.5.2
*/
public class SplashScreenTest {
public static void main(String[] args) {
Project p = new Project();
SplashTask t = new SplashTask();
t.setProject(p);
t.execute();
// give it some time to display
try {
Thread.currentThread().sleep(2000);
} catch (InterruptedException e) {
} // end of try-catch
p.fireBuildFinished(null);
System.err.println("finished");
try {
Thread.currentThread().sleep(2000);
} catch (InterruptedException e) {
} // end of try-catch
System.err.println("exiting");
System.exit(0);
}
}
