bodewig 2003/02/06 04:09:21
Modified: . Tag: ANT_15_BRANCH WHATSNEW build.xml
src/main/org/apache/tools/ant/taskdefs/optional/splash Tag:
ANT_15_BRANCH SplashScreen.java
Log:
merge fix for 16818 from HEAD
Revision Changes Path
No revision
No revision
1.263.2.120 +2 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.263.2.119
retrieving revision 1.263.2.120
diff -u -r1.263.2.119 -r1.263.2.120
--- WHATSNEW 31 Jan 2003 13:10:53 -0000 1.263.2.119
+++ WHATSNEW 6 Feb 2003 12:09:18 -0000 1.263.2.120
@@ -80,6 +80,8 @@
* Java task (and output system) now stores output which doos not end with a
line feed.
+* splash screen wouldn't disppear when build was finished.
+
Other changes:
--------------
1.304.2.43 +3 -1 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.304.2.42
retrieving revision 1.304.2.43
diff -u -r1.304.2.42 -r1.304.2.43
--- build.xml 28 Jan 2003 11:28:24 -0000 1.304.2.42
+++ build.xml 6 Feb 2003 12:09:19 -0000 1.304.2.43
@@ -1197,6 +1197,7 @@
<patternset refid="needs.jakarta.regexp"/>
<patternset refid="needs.jakarta.oro"/>
+ <patternset refid="needs.swing"/>
<patternset refid="needs.trax"/>
<patternset refid="needs.xslp"/>
<patternset refid="needs.xalan1"/>
@@ -1294,8 +1295,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 -->
No revision
No revision
1.3.2.1 +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.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- SplashScreen.java 15 Apr 2002 12:11:49 -0000 1.3
+++ SplashScreen.java 6 Feb 2003 12:09:21 -0000 1.3.2.1
@@ -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
@@ -140,7 +140,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);}
