[SCM] libswingworker-java packaging branch, master, updated. upstream/1.1-19-gb092f45
Andres Mejia
ceros-guest at alioth.debian.org
Thu Jan 20 23:56:10 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libswingworker-java packaging".
The branch, master has been updated
via b092f45c452d821cb9c57e22327391dc1e140344 (commit)
via d5e9c18cdfbb3633aad798011994c978863edc3b (commit)
via ea544a346566c470ad4f0323dd2832b6422bfe7c (commit)
via 51d0d66f29ca0051f760b611852e29345db41476 (commit)
via 65c7b7464b61d3b5e331d9b34f8767c39a15cc0a (commit)
via ec114d5463539904ebfedb45e5f2b564f0c41d9b (commit)
via 4f962837e50f5ab00b23512fc6feb4ae06d8c298 (commit)
via 9516cd6f8e02e0a9f235e06e721f2d64498c2ce7 (commit)
via 8b3210cf58c627ab41b6c80751bb0703880c620a (commit)
via c34ce1161a56468108c6e9e6ca4af5eb0db2efb3 (commit)
via 2408c8dcd27a1abd70ddf9a85e003caefa257ebd (commit)
via 8b0c7cd23b7663d2a361f033bc0cc36a76bbb82e (commit)
via ecaab5263dd250e528edc389cc798657ee97a4c0 (commit)
via bdd749d892fa1ffb5c69821643b22ee5316193a5 (commit)
via 2014b0f57daec9c82de460e6d7f38b7d785e647f (commit)
via 3217fe3c2de376aa07d642b178b8fe42e4fe142f (commit)
via c57c9aaf9aae26f283bc7fbe49ef12d69eeb3862 (commit)
from 2f596343fda8484a6457d20c2655e532c253ad33 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b092f45c452d821cb9c57e22327391dc1e140344
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:52:45 2011 -0500
Update changelog.
commit d5e9c18cdfbb3633aad798011994c978863edc3b
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:51:45 2011 -0500
Add Vcs entries in control file.
commit ea544a346566c470ad4f0323dd2832b6422bfe7c
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:50:35 2011 -0500
Remove url for old upstream tarball.
commit 51d0d66f29ca0051f760b611852e29345db41476
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:48:59 2011 -0500
Fix spelling error.
commit 65c7b7464b61d3b5e331d9b34f8767c39a15cc0a
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:46:37 2011 -0500
Update changelog.
commit ec114d5463539904ebfedb45e5f2b564f0c41d9b
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:42:14 2011 -0500
Add watch file.
commit 4f962837e50f5ab00b23512fc6feb4ae06d8c298
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:39:46 2011 -0500
Be more descriptive in short description.
commit 9516cd6f8e02e0a9f235e06e721f2d64498c2ce7
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:38:22 2011 -0500
Add source format to 3.0 (quilt).
commit 8b3210cf58c627ab41b6c80751bb0703880c620a
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:36:48 2011 -0500
Add ${java:Depends} and ${misc:Depends}
commit c34ce1161a56468108c6e9e6ca4af5eb0db2efb3
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:35:36 2011 -0500
Fix Section and Priority fields, using java for section and removing duplicate fields.
commit 2408c8dcd27a1abd70ddf9a85e003caefa257ebd
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:34:21 2011 -0500
Drop building of doc package, comes in a seperate source tarball upstream.
commit 8b0c7cd23b7663d2a361f033bc0cc36a76bbb82e
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 18:33:12 2011 -0500
Use dh with javahelper for packaging.
Include junit packages since testcases are now automatically run.
commit ecaab5263dd250e528edc389cc798657ee97a4c0
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 17:59:13 2011 -0500
Bump Standards-Version to 3.9.1.
commit bdd749d892fa1ffb5c69821643b22ee5316193a5
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 17:57:44 2011 -0500
Update changelog.
commit 2014b0f57daec9c82de460e6d7f38b7d785e647f
Merge: c57c9aa 3217fe3
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 17:56:32 2011 -0500
Merge commit 'upstream/1.2'
commit c57c9aaf9aae26f283bc7fbe49ef12d69eeb3862
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu Jan 20 17:55:53 2011 -0500
Add get orig source script for new upstream version.
-----------------------------------------------------------------------
Summary of changes:
COPYING | 511 +++++++++++
build.xml | 90 ++
debian/changelog | 20 +-
debian/control | 29 +-
debian/copyright | 3 -
debian/javabuild | 1 +
debian/libswingworker-java-doc.dirs | 1 -
debian/libswingworker-java-get-orig-source | 58 ++
debian/libswingworker-java.dirs | 1 -
debian/libswingworker-java.jlibs | 1 +
debian/rules | 34 +-
debian/source/format | 1 +
debian/watch | 1 +
.../org/jdesktop/swingworker/PrimeNumbersDemo.java | 99 +++
.../jdesktop/swingworker/AccumulativeRunnable.java | 158 ++++
.../swingworker/SwingPropertyChangeSupport.java | 107 +++
src/java/org/jdesktop/swingworker/SwingWorker.java | 902 ++++++++++++++++++++
.../org/jdesktop/swingworker/SwingWorkerTest.java | 294 +++++++
swing-worker-src-1.1.zip | Bin 37100 -> 0 bytes
19 files changed, 2252 insertions(+), 59 deletions(-)
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..cdf49ce
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,511 @@
+Copyright (c) 2005 Sun Microsystems, Inc., 4150 Network Circle, Santa
+Clara, California 95054, U.S.A. All rights reserved. Use is subject
+to license terms below. Sun, Sun Microsystems and the Sun logo are
+trademarks or registered trademarks of Sun Microsystems, Inc. in the
+U.S. and other countries.
+
+Notice: This product is covered by U.S. export control laws and may be
+subject to the export or import laws in other countries. These laws may
+restrict the fields of use for this software and may require you to
+secure government authorization.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..59e9040
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+$Id: build.xml,v 1.2 2005/06/20 17:16:45 idk Exp $
+
+Copyright © 2005 Sun Microsystems, Inc. All rights
+reserved. Use is subject to license terms.
+-->
+<project name="SwingWorker" default="compile" basedir=".">
+ <property name="src.dir" value="src/java" />
+ <property name="test.dir" value="src/test" />
+ <property name="demo.dir" value="src/demo" />
+ <property name="build.dir" value="build" />
+ <property name="dist.dir" value="dist" />
+ <property name="javadoc.dir" value="${dist.dir}/javadoc" />
+ <property name="bundles.dir" value="${dist.dir}/bundles" />
+ <property name="www.dir" value="www" />
+
+ <property name="external.doc"
+ value="http://java.sun.com/j2se/1.5.0/docs/api" />
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}"/>
+ </target>
+
+ <target name="init">
+ <mkdir dir="${build.dir}"/>
+ <tstamp/>
+ </target>
+
+ <target name="init-dist">
+ <mkdir dir="${dist.dir}"/>
+ </target>
+
+ <target name="compile" depends="init">
+ <javac source="1.5" destdir="${build.dir}" memoryMaximumSize="200m" fork="yes">
+ <src path="${src.dir}" />
+ </javac>
+ </target>
+
+ <target name="demo" depends="compile">
+ <javac source="1.5" destdir="${build.dir}" memoryMaximumSize="200m" fork="yes">
+ <src path="${demo.dir}" />
+ </javac>
+ <java classpath="${build.dir}"
+ classname="org.jdesktop.swingworker.PrimeNumbersDemo" fork="true" />
+ </target>
+
+ <target name="test" depends="compile">
+ <javac source="1.5" destdir="${build.dir}" memoryMaximumSize="200m" fork="yes">
+ <src path="${test.dir}" />
+ </javac>
+ <junit printsummary="yes" showoutput="yes" fork="yes">
+ <formatter type="plain"/>
+ <classpath>
+ <dirset dir="${build.dir}"/>
+ </classpath>
+ <test name="org.jdesktop.swingworker.SwingWorkerTest"/>
+ </junit>
+ </target>
+
+ <target name="javadoc" depends="init-dist">
+ <javadoc access="protected" link=""
+ packagenames="org.jdesktop.swingworker" author="true" destdir="${javadoc.dir}"
+ nodeprecated="false" nodeprecatedlist="false" noindex="false"
+ nonavbar="false" notree="false" use="true" version="true">
+ <link href="${external.doc}" />
+ <sourcepath>
+ <pathelement path="${src.dir}" />
+ </sourcepath>
+ </javadoc>
+ </target>
+
+ <target name="bundles" depends="clean, compile, javadoc">
+ <mkdir dir="${bundles.dir}"/>
+ <zip basedir="." destfile="${bundles.dir}/swing-worker-src.zip"
+ includes="src/**, build.xml, COPYING"
+ />
+ <zip basedir="${javadoc.dir}" destfile="${bundles.dir}/swing-worker-doc.zip"/>
+ <jar basedir="${build.dir}" destfile="${bundles.dir}/swing-worker.jar"/>
+ </target>
+
+ <target name="www" depends="clean, javadoc">
+ <delete dir="${www.dir}/javadoc"/>
+ <copy todir="${www.dir}/javadoc">
+ <fileset dir="${javadoc.dir}"/>
+ </copy>
+ </target>
+
+</project>
diff --git a/debian/changelog b/debian/changelog
index 136fa25..0a24ca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,23 @@
-libswingworker-java (1.1-1) unstable; urgency=low
+libswingworker-java (1.2-1) unstable; urgency=low
* Upload for Debian.
+ * New upstream release.
* Add Debian Java team as Maintainer, Marek and myself as Uploaders.
-
- -- Andres Mejia <mcitadel at gmail.com> Sun, 09 Jan 2011 10:26:05 -0500
+ * Bump Standards-Version to 3.9.1.
+ * Use dh with javahelper for packaging. Needs build dependency on junit4 and
+ junit.
+ * Drop building of doc package, comes in a separate source tarball
+ upstream.
+ * Fix Section and Priority fields, using java for section and removing
+ duplicate fields.
+ * Add ${java:Depends} and ${misc:Depends}.
+ * Add source format to 3.0 (quilt).
+ * Be more descriptive in short description.
+ * Add watch file.
+ * Remove url for old upstream tarball.
+ * Add Vcs entries in control file.
+
+ -- Andres Mejia <mcitadel at gmail.com> Thu, 20 Jan 2011 18:52:19 -0500
libswingworker-java (1.1-0ubuntu3) intrepid; urgency=low
diff --git a/debian/control b/debian/control
index 3a4d6f1..78e1228 100644
--- a/debian/control
+++ b/debian/control
@@ -1,36 +1,23 @@
Source: libswingworker-java
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Marek Slama <marek.slama at sun.com>,
Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>=5), cdbs (>=0.4.8)
-Build-Depends-Indep: ant, default-jdk, unzip
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk, ant, junit4,
+ junit
+Standards-Version: 3.9.1
Homepage: http://swingworker.dev.java.net/
+Vcs-Browser: http://git.debian.org/?p=pkg-java/libswingworker-java.git
+Vcs-Git: git://git.debian.org/git/pkg-java/libswingworker-java.git
Package: libswingworker-java
Architecture: all
-Section: libs
-Priority: optional
-Depends: default-jre | java2-runtime
+Depends: default-jre | java2-runtime, ${java:Depends}, ${misc:Depends}
Suggests: libswingworker-java-doc
-Description: Swing Worker API
+Description: Java Swing Worker API
SwingWorker is designed for situations where you need
to have a long running task run in a background thread
and provide updates to the UI either when done, or
while processing. This project is a backport of SwingWorker
included into Java 1.6.
-
-Package: libswingworker-java-doc
-Architecture: all
-Section: doc
-Priority: optional
-Description: Swing Worker API
- SwingWorker is designed for situations where you need
- to have a long running task run in a background thread
- and provide updates to the UI either when done, or
- while processing. This project is a backport of SwingWorker
- included into Java 1.6.
- .
- This package contains Javadoc API documentation.
diff --git a/debian/copyright b/debian/copyright
index 33adebe..580fb60 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,6 @@ This package was debianized by Marek Slama <marek.slama at sun.com> on
The current Debian maintainer is Marek Slama <marek.slama at sun.com>
-Upstream downloaded from:
- https://swingworker.dev.java.net/files/documents/2810/51782/swing-worker-src-1.1.zip
-
Upstream home page:
http://swingworker.dev.java.net/
diff --git a/debian/javabuild b/debian/javabuild
new file mode 100644
index 0000000..0b6a9cc
--- /dev/null
+++ b/debian/javabuild
@@ -0,0 +1 @@
+swing-worker.jar src
diff --git a/debian/libswingworker-java-doc.dirs b/debian/libswingworker-java-doc.dirs
deleted file mode 100644
index d6867ab..0000000
--- a/debian/libswingworker-java-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libswingworker-java-doc
diff --git a/debian/libswingworker-java-get-orig-source b/debian/libswingworker-java-get-orig-source
new file mode 100755
index 0000000..d51e9f9
--- /dev/null
+++ b/debian/libswingworker-java-get-orig-source
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# This script is used to download the upstream source for libswingworker-java
+# and generate it into an orig source tarball for Debian.
+
+# Common variables used to ease maintenance of this script
+LIBSWINGWORKER_JAVA_TARBALL="swing-worker-src-1.2.zip"
+LIBSWINGWORKER_JAVA_TARBALL_CHECKSUM="4f9b52b24c39f0487aae1f46844608da2339fa9b"
+LIBSWINGWORKER_JAVA_VERSION="1.2"
+
+USAGE="\n\
+This script is used to generate the orig tarball used in building\n\
+Debian packages for libswingworker-java-$LIBSWINGWORKER_JAVA_VERSION.\n\
+Usage: libswingworker-java-get-orig-source [OPTION]\n\
+\n\
+ -h, --help Display this help message.\n\
+ --remove-upstream-tarball Remove the upstream source tarball.\n"
+
+while [ "$#" -gt "0" ]
+do
+ case "$1" in
+ --remove-upstream-tarball)
+ REMOVE_UPSTREAM_TARBALL=1
+ shift
+ ;;
+ -h|--help|*)
+ echo "${USAGE}"
+ exit 1
+ ;;
+ esac
+done
+
+make_current_tarball() {
+ # Download the tarball if it's not available in the current directory
+ [ -f $LIBSWINGWORKER_JAVA_TARBALL ] || \
+ wget -c https://swingworker.dev.java.net/files/documents/2810/105151/$LIBSWINGWORKER_JAVA_TARBALL
+
+ # Verify the checksum
+ COMPUTED_CHECKSUM=`sha1sum $LIBSWINGWORKER_JAVA_TARBALL | cut -d ' ' -f 1`
+ if [ $LIBSWINGWORKER_JAVA_TARBALL_CHECKSUM != $COMPUTED_CHECKSUM ] ; then
+ echo "Checksum verification failed. Checksum was $COMPUTED_CHECKSUM
+ Expected checksum $LIBSWINGWORKER_JAVA_TARBALL_CHECKSUM."
+ exit 1
+ else
+ echo "Checksum verified. Checksum is $COMPUTED_CHECKSUM."
+ fi
+
+ echo "Copying upstream tarball with different name and running jh_repack."
+ cp -f $LIBSWINGWORKER_JAVA_TARBALL libswingworker-java_${LIBSWINGWORKER_JAVA_VERSION}.orig.zip
+ jh_repack --upstream-version ${LIBSWINGWORKER_JAVA_VERSION} libswingworker-java_${LIBSWINGWORKER_JAVA_VERSION}.orig.zip
+ if [ $REMOVE_UPSTREAM_TARBALL ]; then
+ echo -n "Removing upstream tarball..."
+ rm $LIBSWINGWORKER_JAVA_TARBALL
+ echo "done."
+ fi
+}
+
+make_current_tarball
diff --git a/debian/libswingworker-java.dirs b/debian/libswingworker-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libswingworker-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libswingworker-java.jlibs b/debian/libswingworker-java.jlibs
new file mode 100644
index 0000000..4f36f67
--- /dev/null
+++ b/debian/libswingworker-java.jlibs
@@ -0,0 +1 @@
+swing-worker.jar
diff --git a/debian/rules b/debian/rules
index dc6d85c..ed467a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,7 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/junit4.jar:/usr/share/java/junit.jar
-DEB_TAR_SRCDIR :=.
-
-JAVA_HOME=/usr/lib/jvm/default-java
-
-include /usr/share/cdbs/1/rules/tarball.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-# package name
-sw-pkg := libswingworker-java
-
-build/$(sw-pkg):: stamp-build-$(sw-pkg)
-
-# This target is here to avoid multiple invocation of build target.
-# build/$(sw-pkg) is invoked 2 times when building binary packages.
-stamp-build-$(sw-pkg):
- ant -f $(DEB_SRCDIR)/build.xml -Djavadoc.dir=dist/javadoc/api bundles
- touch $@
-
-install/$(sw-pkg)::
- install -m 644 $(DEB_SRCDIR)/dist/bundles/swing-worker.jar debian/$(sw-pkg)/usr/share/java/swing-worker-$(DEB_UPSTREAM_VERSION).jar
- dh_link -p$(sw-pkg) usr/share/java/swing-worker-$(DEB_UPSTREAM_VERSION).jar usr/share/java/swing-worker.jar
-
-install/$(sw-pkg)-doc::
- dh_installdocs -p$(sw-pkg)-doc $(DEB_SRCDIR)/dist/javadoc/api
-clean::
- # these files are left by cdbs (a bug?)
- -rm -f *.cdbs-config_list
- -rm -f stamp-build-$(sw-pkg)
+%:
+ dh $@ --with javahelper
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..1b3c3b8
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1 @@
+# Upstream directory names change too, interfering with the use of uscan.
diff --git a/src/demo/org/jdesktop/swingworker/PrimeNumbersDemo.java b/src/demo/org/jdesktop/swingworker/PrimeNumbersDemo.java
new file mode 100644
index 0000000..db8f4d9
--- /dev/null
+++ b/src/demo/org/jdesktop/swingworker/PrimeNumbersDemo.java
@@ -0,0 +1,99 @@
+/*
+ * $Id: PrimeNumbersDemo.java,v 1.2 2006/09/28 20:20:30 idk Exp $
+ *
+ * Copyright © 2005 Sun Microsystems, Inc. All rights
+ * reserved. Use is subject to license terms.
+ */
+
+package org.jdesktop.swingworker;
+
+import java.awt.BorderLayout;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JFrame;
+import javax.swing.JProgressBar;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+public class PrimeNumbersDemo {
+ public static void main(String[] args) throws Exception {
+ JFrame frame = new JFrame("Prime Numbers Demo");
+ frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ JTextArea textArea = new JTextArea();
+ textArea.setEditable(false);
+ frame.add(new JScrollPane(textArea), BorderLayout.CENTER);
+ PrimeNumbersTask task = new PrimeNumbersTask(textArea, 10000);
+ final JProgressBar progressBar = new JProgressBar(0, 100);
+ progressBar.setIndeterminate(true);
+ frame.add(progressBar, BorderLayout.NORTH);
+
+ frame.setSize(500, 500);
+ frame.setVisible(true);
+
+ task.addPropertyChangeListener(
+ new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ if ("progress".equals(evt.getPropertyName())) {
+ progressBar.setIndeterminate(false);
+ progressBar.setValue((Integer)evt.getNewValue());
+ }
+ }
+ });
+ task.execute();
+
+ return;
+ }
+
+ /**
+ * Finds first N prime numbers.
+ */
+ static class PrimeNumbersTask extends SwingWorker<List<Integer>, Integer> {
+ final int numbersToFind;
+ //sorted list of consequent prime numbers
+ private final List<Integer> primeNumbers;
+ private final JTextArea textArea;
+
+ PrimeNumbersTask(JTextArea textArea, int numbersToFind) {
+ this.textArea = textArea;
+ this.numbersToFind = numbersToFind;
+ this.primeNumbers = new ArrayList<Integer>(numbersToFind);
+ }
+
+ @Override
+ public List<Integer> doInBackground() {
+ int number = 2;
+ while(primeNumbers.size() < numbersToFind
+ && !isCancelled()) {
+ if (isPrime(number)) {
+ primeNumbers.add(number);
+ setProgress(100 * primeNumbers.size() / numbersToFind);
+ publish(number);
+ }
+ number++;
+ }
+ return primeNumbers;
+ }
+
+ @Override
+ protected void process(List<Integer> chunks) {
+ StringBuilder strBuilder = new StringBuilder();
+ for (int number : chunks) {
+ strBuilder.append(number).append('\n');
+ }
+ textArea.append(strBuilder.toString());
+ }
+ private boolean isPrime(int number) {
+ for (int prime : primeNumbers) {
+ if (number % prime == 0) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+}
+
+
diff --git a/src/java/org/jdesktop/swingworker/AccumulativeRunnable.java b/src/java/org/jdesktop/swingworker/AccumulativeRunnable.java
new file mode 100644
index 0000000..4feec4f
--- /dev/null
+++ b/src/java/org/jdesktop/swingworker/AccumulativeRunnable.java
@@ -0,0 +1,158 @@
+/*
+ * $Id: AccumulativeRunnable.java,v 1.3 2008/07/25 19:32:29 idk Exp $
+ *
+ * Copyright � 2005 Sun Microsystems, Inc. All rights
+ * reserved. Use is subject to license terms.
+ */
+
+package org.jdesktop.swingworker;
+
+import java.util.*;
+import javax.swing.SwingUtilities;
+
+/**
+ * An abstract class to be used in the cases where we need {@code Runnable}
+ * to perform some actions on an appendable set of data.
+ * The set of data might be appended after the {@code Runnable} is
+ * sent for the execution. Usually such {@code Runnables} are sent to
+ * the EDT.
+ *
+ * <p>
+ * Usage example:
+ *
+ * <p>
+ * Say we want to implement JLabel.setText(String text) which sends
+ * {@code text} string to the JLabel.setTextImpl(String text) on the EDT.
+ * In the event JLabel.setText is called rapidly many times off the EDT
+ * we will get many updates on the EDT but only the last one is important.
+ * (Every next updates overrides the previous one.)
+ * We might want to implement this {@code setText} in a way that only
+ * the last update is delivered.
+ * <p>
+ * Here is how one can do this using {@code AccumulativeRunnable}:
+ * <pre>
+ * AccumulativeRunnable<String> doSetTextImpl =
+ * new AccumulativeRunnable<String>() {
+ * @Override
+ * protected void run(List<String> args) {
+ * //set to the last string being passed
+ * setTextImpl(args.get(args.size() - 1);
+ * }
+ * }
+ * void setText(String text) {
+ * //add text and send for the execution if needed.
+ * doSetTextImpl.add(text);
+ * }
+ * </pre>
+ *
+ * <p>
+ * Say we want want to implement addDirtyRegion(Rectangle rect)
+ * which sends this region to the
+ * handleDirtyRegions(List<Rect> regions) on the EDT.
+ * addDirtyRegions better be accumulated before handling on the EDT.
+ *
+ * <p>
+ * Here is how it can be implemented using AccumulativeRunnable:
+ * <pre>
+ * AccumulativeRunnable<Rectangle> doHandleDirtyRegions =
+ * new AccumulativeRunnable<Rectangle>() {
+ * @Override
+ * protected void run(List<Rectangle> args) {
+ * handleDirtyRegions(args);
+ * }
+ * };
+ * void addDirtyRegion(Rectangle rect) {
+ * doHandleDirtyRegions.add(rect);
+ * }
+ * </pre>
+ *
+ * @author Igor Kushnirskiy
+ * @version $Revision: 1.3 $ $Date: 2008/07/25 19:32:29 $
+ *
+ * @param <T> the type this {@code Runnable} accumulates
+ *
+ */
+abstract class AccumulativeRunnable<T> implements Runnable {
+ private List<T> arguments = null;
+
+ /**
+ * Equivalent to {@code Runnable.run} method with the
+ * accumulated arguments to process.
+ *
+ * @param args accumulated arguments to process.
+ */
+ protected abstract void run(List<T> args);
+
+ /**
+ * {@inheritDoc}
+ *
+ * <p>
+ * This implementation calls {@code run(List<T> args)} method
+ * with the list of accumulated arguments.
+ */
+ public final void run() {
+ run(flush());
+ }
+
+ /**
+ * prepends or appends arguments and sends this {@code Runnable} for the
+ * execution if needed.
+ * <p>
+ * This implementation uses {@see #submit} to send this
+ * {@code Runnable} for execution.
+ * @param isPrepend prepend or append
+ * @param args the arguments to add
+ */
+ public final synchronized void add(boolean isPrepend, T... args) {
+ boolean isSubmitted = true;
+ if (arguments == null) {
+ isSubmitted = false;
+ arguments = new ArrayList<T>();
+ }
+ if (isPrepend) {
+ arguments.addAll(0, Arrays.asList(args));
+ } else {
+ Collections.addAll(arguments, args);
+ }
+ if (!isSubmitted) {
+ submit();
+ }
+ }
+
+ /**
+ * appends arguments and sends this {@code Runnable} for the
+ * execution if needed.
+ * <p>
+ * This implementation uses {@see #submit} to send this
+ * {@code Runnable} for execution.
+ * @param args the arguments to accumulate
+ */
+ public final void add(T... args) {
+ add(false, args);
+ }
+
+ /**
+ * Sends this {@code Runnable} for the execution
+ *
+ * <p>
+ * This method is to be executed only from {@code add} method.
+ *
+ * <p>
+ * This implementation uses {@code SwingWorker.invokeLater}.
+ */
+ protected void submit() {
+ SwingUtilities.invokeLater(this);
+ }
+
+ /**
+ * Returns accumulated arguments and flashes the arguments storage.
+ *
+ * @return accumulated arguments
+ */
+ private final synchronized List<T> flush() {
+ List<T> list = arguments;
+ arguments = null;
+ return list;
+ }
+}
+
diff --git a/src/java/org/jdesktop/swingworker/SwingPropertyChangeSupport.java b/src/java/org/jdesktop/swingworker/SwingPropertyChangeSupport.java
new file mode 100644
index 0000000..4762cea
--- /dev/null
+++ b/src/java/org/jdesktop/swingworker/SwingPropertyChangeSupport.java
@@ -0,0 +1,107 @@
+/*
+ * $Id: SwingPropertyChangeSupport.java,v 1.1 2005/06/18 21:27:14 idk Exp $
+ *
+ * Copyright © 2005 Sun Microsystems, Inc. All rights
+ * reserved. Use is subject to license terms.
+ */
+
+package org.jdesktop.swingworker;
+
+import java.beans.PropertyChangeSupport;
+import java.beans.PropertyChangeEvent;
+
+import javax.swing.SwingUtilities;
+
+/**
+ * This subclass of {@code java.beans.PropertyChangeSupport} is almost
+ * identical in functionality. The only difference is if constructed with
+ * {@code SwingPropertyChangeSupport(sourceBean, true)} it ensures
+ * listeners are only ever notified on the <i>Event Dispatch Thread</i>.
+ *
+ * @author Igor Kushnirskiy
+ * @version $Revision: 1.1 $ $Date: 2005/06/18 21:27:14 $
+ */
+
+public final class SwingPropertyChangeSupport extends PropertyChangeSupport {
+
+ /**
+ * Constructs a SwingPropertyChangeSupport object.
+ *
+ * @param sourceBean The bean to be given as the source for any
+ * events.
+ * @throws NullPointerException if {@code sourceBean} is
+ * {@code null}
+ */
+ public SwingPropertyChangeSupport(Object sourceBean) {
+ this(sourceBean, false);
+ }
+
+ /**
+ * Constructs a SwingPropertyChangeSupport object.
+ *
+ * @param sourceBean the bean to be given as the source for any events
+ * @param notifyOnEDT whether to notify listeners on the <i>Event
+ * Dispatch Thread</i> only
+ *
+ * @throws NullPointerException if {@code sourceBean} is
+ * {@code null}
+ * @since 1.6
+ */
+ public SwingPropertyChangeSupport(Object sourceBean, boolean notifyOnEDT) {
+ super(sourceBean);
+ this.notifyOnEDT = notifyOnEDT;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * <p>
+ * If {@see #isNotifyOnEDT} is {@code true} and called off the
+ * <i>Event Dispatch Thread</i> this implementation uses
+ * {@code SwingUtilities.invokeLater} to send out the notification
+ * on the <i>Event Dispatch Thread</i>. This ensures listeners
+ * are only ever notified on the <i>Event Dispatch Thread</i>.
+ *
+ * @throws NullPointerException if {@code evt} is
+ * {@code null}
+ * @since 1.6
+ */
+ public void firePropertyChange(final PropertyChangeEvent evt) {
+ if (evt == null) {
+ throw new NullPointerException();
+ }
+ if (! isNotifyOnEDT()
+ || SwingUtilities.isEventDispatchThread()) {
+ super.firePropertyChange(evt);
+ } else {
+ SwingUtilities.invokeLater(
+ new Runnable() {
+ public void run() {
+ firePropertyChange(evt);
+ }
+ });
+ }
+ }
+
+ /**
+ * Returns {@code notifyOnEDT} property.
+ *
+ * @return {@code notifyOnEDT} property
+ * @see #SwingPropertyChangeSupport(Object sourceBean, boolean notifyOnEDT)
+ * @since 1.6
+ */
+ public final boolean isNotifyOnEDT() {
+ return notifyOnEDT;
+ }
+
+ // Serialization version ID
+ static final long serialVersionUID = 7162625831330845068L;
+
+ /**
+ * whether to notify listeners on EDT
+ *
+ * @serial
+ * @since 1.6
+ */
+ private final boolean notifyOnEDT;
+}
diff --git a/src/java/org/jdesktop/swingworker/SwingWorker.java b/src/java/org/jdesktop/swingworker/SwingWorker.java
new file mode 100644
index 0000000..7533108
--- /dev/null
+++ b/src/java/org/jdesktop/swingworker/SwingWorker.java
@@ -0,0 +1,902 @@
+/*
+ * $Id: SwingWorker.java,v 1.6 2008/07/25 19:32:29 idk Exp $
+ *
+ * Copyright � 2005 Sun Microsystems, Inc. All rights
+ * reserved. Use is subject to license terms.
+ */
+
+package org.jdesktop.swingworker;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.beans.PropertyChangeEvent;
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.*;
+
+import java.awt.event.*;
+
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+
+/**
+ * An abstract class to perform lengthy GUI-interacting tasks in a
+ * dedicated thread.
+ *
+ * <p>
+ * When writing a multi-threaded application using Swing, there are
+ * two constraints to keep in mind:
+ * (refer to
+ * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">
+ * How to Use Threads
+ * </a> for more details):
+ * <ul>
+ * <li> Time-consuming tasks should not be run on the <i>Event
+ * Dispatch Thread</i>. Otherwise the application becomes unresponsive.
+ * </li>
+ * <li> Swing components should be accessed on the <i>Event
+ * Dispatch Thread</i> only.
+ * </li>
+ * </ul>
+ *
+ * <p>
+ *
+ * <p>
+ * These constraints mean that a GUI application with time intensive
+ * computing needs at least two threads: 1) a thread to perform the lengthy
+ * task and 2) the <i>Event Dispatch Thread</i> (EDT) for all GUI-related
+ * activities. This involves inter-thread communication which can be
+ * tricky to implement.
+ *
+ * <p>
+ * {@code SwingWorker} is designed for situations where you need to have a long
+ * running task run in a background thread and provide updates to the UI
+ * either when done, or while processing.
+ * Subclasses of {@code SwingWorker} must implement
+ * the {@see #doInBackground} method to perform the background computation.
+ *
+ *
+ * <p>
+ * <b>Workflow</b>
+ * <p>
+ * There are three threads involved in the life cycle of a
+ * {@code SwingWorker} :
+ * <ul>
+ * <li>
+ * <p>
+ * <i>Current</i> thread: The {@link #execute} method is
+ * called on this thread. It schedules {@code SwingWorker} for the execution on a
+ * <i>worker</i>
+ * thread and returns immediately. One can wait for the {@code SwingWorker} to
+ * complete using the {@link #get get} methods.
+ * <li>
+ * <p>
+ * <i>Worker</i> thread: The {@link #doInBackground}
+ * method is called on this thread.
+ * This is where all background activities should happen. To notify
+ * {@code PropertyChangeListeners} about bound properties changes use the
+ * {@link #firePropertyChange firePropertyChange} and
+ * {@link #getPropertyChangeSupport} methods. By default there are two bound
+ * properties available: {@code state} and {@code progress}.
+ * <li>
+ * <p>
+ * <i>Event Dispatch Thread</i>: All Swing related activities occur
+ * on this thread. {@code SwingWorker} invokes the
+ * {@link #process process} and {@link #done} methods and notifies
+ * any {@code PropertyChangeListeners} on this thread.
+ * </ul>
+ *
+ * <p>
+ * Often, the <i>Current</i> thread is the <i>Event Dispatch
+ * Thread</i>.
+ *
+ *
+ * <p>
+ * Before the {@code doInBackground} method is invoked on a <i>worker</i> thread,
+ * {@code SwingWorker} notifies any {@code PropertyChangeListeners} about the
+ * {@code state} property change to {@code StateValue.STARTED}. After the
+ * {@code doInBackground} method is finished the {@code done} method is
+ * executed. Then {@code SwingWorker} notifies any {@code PropertyChangeListeners}
+ * about the {@code state} property change to {@code StateValue.DONE}.
+ *
+ * <p>
+ * {@code SwingWorker} is only designed to be executed once. Executing a
+ * {@code SwingWorker} more than once will not result in invoking the
+ * {@code doInBackground} method twice.
+ *
+ * <p>
+ * <b>Sample Usage</b>
+ * <p>
+ * The following example illustrates the simplest use case. Some
+ * processing is done in the background and when done you update a Swing
+ * component.
+ *
+ * <p>
+ * Say we want to find the "Meaning of Life" and display the result in
+ * a {@code JLabel}.
+ *
+ * <pre>
+ * final JLabel label;
+ * class MeaningOfLifeFinder extends SwingWorker<String, Object> {
+ * {@code @Override}
+ * public String doInBackground() {
+ * return findTheMeaningOfLife();
+ * }
+ *
+ * {@code @Override}
+ * protected void done() {
+ * try {
+ * label.setText(get());
+ * } catch (Exception ignore) {
+ * }
+ * }
+ * }
+ *
+ * (new MeaningOfLifeFinder()).execute();
+ * </pre>
+ *
+ * <p>
+ * The next example is useful in situations where you wish to process data
+ * as it is ready on the <i>Event Dispatch Thread</i>.
+ *
+ * <p>
+ * Now we want to find the first N prime numbers and display the results in a
+ * {@code JTextArea}. While this is computing, we want to update our
+ * progress in a {@code JProgressBar}. Finally, we also want to print
+ * the prime numbers to {@code System.out}.
+ * <pre>
+ * class PrimeNumbersTask extends
+ * SwingWorker<List<Integer>, Integer> {
+ * PrimeNumbersTask(JTextArea textArea, int numbersToFind) {
+ * //initialize
+ * }
+ *
+ * {@code @Override}
+ * public List<Integer> doInBackground() {
+ * while (! enough && ! isCancelled()) {
+ * number = nextPrimeNumber();
+ * publish(number);
+ * setProgress(100 * numbers.size() / numbersToFind);
+ * }
+ * }
+ * return numbers;
+ * }
+ *
+ * {@code @Override}
+ * protected void process(List<Integer> chunks) {
+ * for (int number : chunks) {
+ * textArea.append(number + "\n");
+ * }
+ * }
+ * }
+ *
+ * JTextArea textArea = new JTextArea();
+ * final JProgressBar progressBar = new JProgressBar(0, 100);
+ * PrimeNumbersTask task = new PrimeNumbersTask(textArea, N);
+ * task.addPropertyChangeListener(
+ * new PropertyChangeListener() {
+ * public void propertyChange(PropertyChangeEvent evt) {
+ * if ("progress".equals(evt.getPropertyName())) {
+ * progressBar.setValue((Integer)evt.getNewValue());
+ * }
+ * }
+ * });
+ *
+ * task.execute();
+ * System.out.println(task.get()); //prints all prime numbers we have got
+ * </pre>
+ *
+ * <p>
+ * Because {@code SwingWorker} implements {@code Runnable}, a
+ * {@code SwingWorker} can be submitted to an
+ * {@link java.util.concurrent.Executor} for execution.
+ *
+ * @author Igor Kushnirskiy
+ * @version $Revision: 1.6 $ $Date: 2008/07/25 19:32:29 $
+ *
+ * @param <T> the result type returned by this {@code SwingWorker's}
+ * {@code doInBackground} and {@code get} methods
+ * @param <V> the type used for carrying out intermediate results by this
+ * {@code SwingWorker's} {@code publish} and {@code process} methods
+ *
+ */
+public abstract class SwingWorker<T, V> implements Future<T>, Runnable {
+ /**
+ * number of worker threads.
+ */
+ private static final int MAX_WORKER_THREADS = 10;
+
+ /**
+ * current progress.
+ */
+ private volatile int progress;
+
+ /**
+ * current state.
+ */
+ private volatile StateValue state;
+
+ /**
+ * everything is run inside this FutureTask. Also it is used as
+ * a delegatee for the Future API.
+ */
+ private final FutureTask<T> future;
+
+ /**
+ * all propertyChangeSupport goes through this.
+ */
+ private final PropertyChangeSupport propertyChangeSupport;
+
+ /**
+ * handler for {@code process} method.
+ */
+ private AccumulativeRunnable<V> doProcess;
+
+ /**
+ * handler for progress property change notifications.
+ */
+ private AccumulativeRunnable<Integer> doNotifyProgressChange;
+
+ private static final AccumulativeRunnable<Runnable> doSubmit =
+ new DoSubmitAccumulativeRunnable();
+
+ private static ExecutorService executorService = null;
+
+ /**
+ * Values for the {@code state} bound property.
+ */
+ public enum StateValue {
+ /**
+ * Initial {@code SwingWorker} state.
+ */
+ PENDING,
+ /**
+ * {@code SwingWorker} is {@code STARTED}
+ * before invoking {@code doInBackground}.
+ */
+ STARTED,
+
+ /**
+ * {@code SwingWorker} is {@code DONE}
+ * after {@code doInBackground} method
+ * is finished.
+ */
+ DONE
+ };
+
+ /**
+ * Constructs this {@code SwingWorker}.
+ */
+ public SwingWorker() {
+ Callable<T> callable =
+ new Callable<T>() {
+ public T call() throws Exception {
+ setState(StateValue.STARTED);
+ return doInBackground();
+ }
+ };
+
+ future = new FutureTask<T>(callable) {
+ @Override
+ protected void done() {
+ doneEDT();
+ setState(StateValue.DONE);
+ }
+ };
+
+ state = StateValue.PENDING;
+ propertyChangeSupport = new SwingWorkerPropertyChangeSupport(this);
+ doProcess = null;
+ doNotifyProgressChange = null;
+ }
+
+ /**
+ * Computes a result, or throws an exception if unable to do so.
+ *
+ * <p>
+ * Note that this method is executed only once.
+ *
+ * <p>
+ * Note: this method is executed in a background thread.
+ *
+ *
+ * @return the computed result
+ * @throws Exception if unable to compute a result
+ *
+ */
+ protected abstract T doInBackground() throws Exception ;
+
+ /**
+ * Sets this {@code Future} to the result of computation unless
+ * it has been cancelled.
+ */
+ public final void run() {
+ future.run();
+ }
+
+ /**
+ * Sends data chunks to the {@link #process} method. This method is to be
+ * used from inside the {@code doInBackground} method to deliver
+ * intermediate results
+ * for processing on the <i>Event Dispatch Thread</i> inside the
+ * {@code process} method.
+ *
+ * <p>
+ * Because the {@code process} method is invoked asynchronously on
+ * the <i>Event Dispatch Thread</i>
+ * multiple invocations to the {@code publish} method
+ * might occur before the {@code process} method is executed. For
+ * performance purposes all these invocations are coalesced into one
+ * invocation with concatenated arguments.
+ *
+ * <p>
+ * For example:
+ *
+ * <pre>
+ * publish("1");
+ * publish("2", "3");
+ * publish("4", "5", "6");
+ * </pre>
+ *
+ * might result in:
+ *
+ * <pre>
+ * process("1", "2", "3", "4", "5", "6")
+ * </pre>
+ *
+ * <p>
+ * <b>Sample Usage</b>. This code snippet loads some tabular data and
+ * updates {@code DefaultTableModel} with it. Note that it safe to mutate
+ * the tableModel from inside the {@code process} method because it is
+ * invoked on the <i>Event Dispatch Thread</i>.
+ *
+ * <pre>
+ * class TableSwingWorker extends
+ * SwingWorker<DefaultTableModel, Object[]> {
+ * private final DefaultTableModel tableModel;
+ *
+ * public TableSwingWorker(DefaultTableModel tableModel) {
+ * this.tableModel = tableModel;
+ * }
+ *
+ * {@code @Override}
+ * protected DefaultTableModel doInBackground() throws Exception {
+ * for (Object[] row = loadData();
+ * ! isCancelled() && row != null;
+ * row = loadData()) {
+ * publish((Object[]) row);
+ * }
+ * return tableModel;
+ * }
+ *
+ * {@code @Override}
+ * protected void process(List<Object[]> chunks) {
+ * for (Object[] row : chunks) {
+ * tableModel.addRow(row);
+ * }
+ * }
+ * }
+ * </pre>
+ *
+ * @param chunks intermediate results to process
+ *
+ * @see #process
+ *
+ */
+ protected final void publish(V... chunks) {
+ synchronized (this) {
+ if (doProcess == null) {
+ doProcess = new AccumulativeRunnable<V>() {
+ @Override
+ public void run(List<V> args) {
+ process(args);
+ }
+ @Override
+ protected void submit() {
+ doSubmit.add(this);
+ }
+ };
+ }
+ }
+ doProcess.add(chunks);
+ }
+
+ /**
+ * Receives data chunks from the {@code publish} method asynchronously on the
+ * <i>Event Dispatch Thread</i>.
+ *
+ * <p>
+ * Please refer to the {@link #publish} method for more details.
+ *
+ * @param chunks intermediate results to process
+ *
+ * @see #publish
+ *
+ */
+ protected void process(List<V> chunks) {
+ }
+
+ /**
+ * Executed on the <i>Event Dispatch Thread</i> after the {@code doInBackground}
+ * method is finished. The default
+ * implementation does nothing. Subclasses may override this method to
+ * perform completion actions on the <i>Event Dispatch Thread</i>. Note
+ * that you can query status inside the implementation of this method to
+ * determine the result of this task or whether this task has been cancelled.
+ *
+ * @see #doInBackground
+ * @see #isCancelled()
+ * @see #get
+ */
+ protected void done() {
+ }
+
+ /**
+ * Sets the {@code progress} bound property.
+ * The value should be from 0 to 100.
+ *
+ * <p>
+ * Because {@code PropertyChangeListener}s are notified asynchronously on
+ * the <i>Event Dispatch Thread</i> multiple invocations to the
+ * {@code setProgress} method might occur before any
+ * {@code PropertyChangeListeners} are invoked. For performance purposes
+ * all these invocations are coalesced into one invocation with the last
+ * invocation argument only.
+ *
+ * <p>
+ * For example, the following invocations:
+ *
+ * <pre>
+ * setProgress(1);
+ * setProgress(2);
+ * setProgress(3);
+ * </pre>
+ *
+ * might result in a single {@code PropertyChangeListener} notification with
+ * the value {@code 3}.
+ *
+ * @param progress the progress value to set
+ * @throws IllegalArgumentException is value not from 0 to 100
+ */
+ protected final void setProgress(int progress) {
+ if (progress < 0 || progress > 100) {
+ throw new IllegalArgumentException("the value should be from 0 to 100");
+ }
+ if (this.progress == progress) {
+ return;
+ }
+ int oldProgress = this.progress;
+ this.progress = progress;
+ if (! getPropertyChangeSupport().hasListeners("progress")) {
+ return;
+ }
+ synchronized (this) {
+ if (doNotifyProgressChange == null) {
+ doNotifyProgressChange =
+ new AccumulativeRunnable<Integer>() {
+ @Override
+ public void run(List<Integer> args) {
+ firePropertyChange("progress",
+ args.get(0),
+ args.get(args.size() - 1));
+ }
+ @Override
+ protected void submit() {
+ doSubmit.add(this);
+ }
+ };
+ }
+ }
+ doNotifyProgressChange.add(oldProgress, progress);
+ }
+
+ /**
+ * Returns the {@code progress} bound property.
+ *
+ * @return the progress bound property.
+ */
+ public final int getProgress() {
+ return progress;
+ }
+
+ /**
+ * Schedules this {@code SwingWorker} for execution on a <i>worker</i>
+ * thread. There are a number of <i>worker</i> threads available. In the
+ * event all <i>worker</i> threads are busy handling other
+ * {@code SwingWorkers} this {@code SwingWorker} is placed in a waiting
+ * queue.
+ *
+ * <p>
+ * Note:
+ * {@code SwingWorker} is only designed to be executed once. Executing a
+ * {@code SwingWorker} more than once will not result in invoking the
+ * {@code doInBackground} method twice.
+ */
+ public final void execute() {
+ getWorkersExecutorService().execute(this);
+ }
+
+ // Future methods START
+ /**
+ * {@inheritDoc}
+ */
+ public final boolean cancel(boolean mayInterruptIfRunning) {
+ return future.cancel(mayInterruptIfRunning);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public final boolean isCancelled() {
+ return future.isCancelled();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public final boolean isDone() {
+ return future.isDone();
+ }
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * Note: calling {@code get} on the <i>Event Dispatch Thread</i> blocks
+ * <i>all</i> events, including repaints, from being processed until this
+ * {@code SwingWorker} is complete.
+ *
+ * <p>
+ * When you want the {@code SwingWorker} to block on the <i>Event
+ * Dispatch Thread</i> we recommend that you use a <i>modal dialog</i>.
+ *
+ * <p>
+ * For example:
+ *
+ * <pre>
+ * class SwingWorkerCompletionWaiter implements PropertyChangeListener {
+ * private JDialog dialog;
+ *
+ * public SwingWorkerCompletionWaiter(JDialog dialog) {
+ * this.dialog = dialog;
+ * }
+ *
+ * public void propertyChange(PropertyChangeEvent event) {
+ * if ("state".equals(event.getPropertyName())
+ * && SwingWorker.StateValue.DONE == event.getNewValue()) {
+ * dialog.setVisible(false);
+ * dialog.dispose();
+ * }
+ * }
+ * }
+ * JDialog dialog = new JDialog(owner, true);
+ * swingWorker.addPropertyChangeListener(
+ * new SwingWorkerCompletionWaiter(dialog));
+ * swingWorker.execute();
+ * //the dialog will be visible until the SwingWorker is done
+ * dialog.setVisible(true);
+ * </pre>
+ */
+ public final T get() throws InterruptedException, ExecutionException {
+ return future.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * Please refer to {@link #get} for more details.
+ */
+ public final T get(long timeout, TimeUnit unit) throws InterruptedException,
+ ExecutionException, TimeoutException {
+ return future.get(timeout, unit);
+ }
+
+ // Future methods END
+
+ // PropertyChangeSupports methods START
+ /**
+ * Adds a {@code PropertyChangeListener} to the listener list. The listener
+ * is registered for all properties. The same listener object may be added
+ * more than once, and will be called as many times as it is added. If
+ * {@code listener} is {@code null}, no exception is thrown and no action is taken.
+ *
+ * <p>
+ * Note: This is merely a convenience wrapper. All work is delegated to
+ * {@code PropertyChangeSupport} from {@link #getPropertyChangeSupport}.
+ *
+ * @param listener the {@code PropertyChangeListener} to be added
+ */
+ public final void addPropertyChangeListener(PropertyChangeListener listener) {
+ getPropertyChangeSupport().addPropertyChangeListener(listener);
+ }
+
+ /**
+ * Removes a {@code PropertyChangeListener} from the listener list. This
+ * removes a {@code PropertyChangeListener} that was registered for all
+ * properties. If {@code listener} was added more than once to the same
+ * event source, it will be notified one less time after being removed. If
+ * {@code listener} is {@code null}, or was never added, no exception is
+ * thrown and no action is taken.
+ *
+ * <p>
+ * Note: This is merely a convenience wrapper. All work is delegated to
+ * {@code PropertyChangeSupport} from {@link #getPropertyChangeSupport}.
+ *
+ * @param listener the {@code PropertyChangeListener} to be removed
+ */
+ public final void removePropertyChangeListener(PropertyChangeListener listener) {
+ getPropertyChangeSupport().removePropertyChangeListener(listener);
+ }
+
+ /**
+ * Reports a bound property update to any registered listeners. No event is
+ * fired if {@code old} and {@code new} are equal and non-null.
+ *
+ * <p>
+ * This {@code SwingWorker} will be the source for
+ * any generated events.
+ *
+ * <p>
+ * When called off the <i>Event Dispatch Thread</i>
+ * {@code PropertyChangeListeners} are notified asynchronously on
+ * the <i>Event Dispatch Thread</i>.
+ * <p>
+ * Note: This is merely a convenience wrapper. All work is delegated to
+ * {@code PropertyChangeSupport} from {@link #getPropertyChangeSupport}.
+ *
+ *
+ * @param propertyName the programmatic name of the property that was
+ * changed
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
+ */
+ public final void firePropertyChange(String propertyName, Object oldValue,
+ Object newValue) {
+ getPropertyChangeSupport().firePropertyChange(propertyName,
+ oldValue, newValue);
+ }
+
+ /**
+ * Returns the {@code PropertyChangeSupport} for this {@code SwingWorker}.
+ * This method is used when flexible access to bound properties support is
+ * needed.
+ * <p>
+ * This {@code SwingWorker} will be the source for
+ * any generated events.
+ *
+ * <p>
+ * Note: The returned {@code PropertyChangeSupport} notifies any
+ * {@code PropertyChangeListener}s asynchronously on the <i>Event Dispatch
+ * Thread</i> in the event that {@code firePropertyChange} or
+ * {@code fireIndexedPropertyChange} are called off the <i>Event Dispatch
+ * Thread</i>.
+ *
+ * @return {@code PropertyChangeSupport} for this {@code SwingWorker}
+ */
+ public final PropertyChangeSupport getPropertyChangeSupport() {
+ return propertyChangeSupport;
+ }
+
+ // PropertyChangeSupports methods END
+
+ /**
+ * Returns the {@code SwingWorker} state bound property.
+ *
+ * @return the current state
+ */
+ public final StateValue getState() {
+ /*
+ * DONE is a special case
+ * to keep getState and isDone is sync
+ */
+ if (isDone()) {
+ return StateValue.DONE;
+ } else {
+ return state;
+ }
+ }
+
+ /**
+ * Sets this {@code SwingWorker} state bound property.
+ * @param the state state to set
+ */
+ private void setState(StateValue state) {
+ StateValue old = this.state;
+ this.state = state;
+ firePropertyChange("state", old, state);
+ }
+
+ /**
+ * Invokes {@code done} on the EDT.
+ */
+ private void doneEDT() {
+ Runnable doDone =
+ new Runnable() {
+ public void run() {
+ done();
+ }
+ };
+ if (SwingUtilities.isEventDispatchThread()) {
+ doDone.run();
+ } else {
+ doSubmit.add(doDone);
+ }
+ }
+
+
+ /**
+ * returns workersExecutorService.
+ *
+ * returns the service stored in the appContext or creates it if
+ * necessary. If the last one it triggers autoShutdown thread to
+ * get started.
+ *
+ * @return ExecutorService for the {@code SwingWorkers}
+ * @see #startAutoShutdownThread
+ */
+ private static synchronized ExecutorService getWorkersExecutorService() {
+ if (executorService == null) {
+ //this creates non-daemon threads.
+ ThreadFactory threadFactory =
+ new ThreadFactory() {
+ final AtomicInteger threadNumber = new AtomicInteger(1);
+ public Thread newThread(final Runnable r) {
+ StringBuilder name =
+ new StringBuilder("SwingWorker-pool-");
+ name.append(System.identityHashCode(this));
+ name.append("-thread-");
+ name.append(threadNumber.getAndIncrement());
+
+ Thread t = new Thread(r, name.toString());;
+ if (t.isDaemon())
+ t.setDaemon(false);
+ if (t.getPriority() != Thread.NORM_PRIORITY)
+ t.setPriority(Thread.NORM_PRIORITY);
+ return t;
+ }
+ };
+
+ /*
+ * We want a to have no more than MAX_WORKER_THREADS
+ * running threads.
+ *
+ * We want a worker thread to wait no longer than 1 second
+ * for new tasks before terminating.
+ */
+ executorService = new ThreadPoolExecutor(0, MAX_WORKER_THREADS,
+ 5L, TimeUnit.SECONDS,
+ new LinkedBlockingQueue<Runnable>(),
+ threadFactory) {
+
+ private final ReentrantLock pauseLock = new ReentrantLock();
+ private final Condition unpaused = pauseLock.newCondition();
+ private boolean isPaused = false;
+ private final ReentrantLock executeLock = new ReentrantLock();
+
+ @Override
+ public void execute(Runnable command) {
+ /*
+ * ThreadPoolExecutor first tries to run task
+ * in a corePool. If all threads are busy it
+ * tries to add task to the waiting queue. If it
+ * fails it run task in maximumPool.
+ *
+ * We want corePool to be 0 and
+ * maximumPool to be MAX_WORKER_THREADS
+ * We need to change the order of the execution.
+ * First try corePool then try maximumPool
+ * pool and only then store to the waiting
+ * queue. We can not do that because we would
+ * need access to the private methods.
+ *
+ * Instead we enlarge corePool to
+ * MAX_WORKER_THREADS before the execution and
+ * shrink it back to 0 after.
+ * It does pretty much what we need.
+ *
+ * While we changing the corePoolSize we need
+ * to stop running worker threads from accepting new
+ * tasks.
+ */
+
+ //we need atomicity for the execute method.
+ executeLock.lock();
+ try {
+
+ pauseLock.lock();
+ try {
+ isPaused = true;
+ } finally {
+ pauseLock.unlock();
+ }
+
+ setCorePoolSize(MAX_WORKER_THREADS);
+ super.execute(command);
+ setCorePoolSize(0);
+
+ pauseLock.lock();
+ try {
+ isPaused = false;
+ unpaused.signalAll();
+ } finally {
+ pauseLock.unlock();
+ }
+ } finally {
+ executeLock.unlock();
+ }
+ }
+ @Override
+ protected void afterExecute(Runnable r, Throwable t) {
+ super.afterExecute(r, t);
+ pauseLock.lock();
+ try {
+ while(isPaused) {
+ unpaused.await();
+ }
+ } catch(InterruptedException ignore) {
+
+ } finally {
+ pauseLock.unlock();
+ }
+ }
+ };
+ }
+ return executorService;
+ }
+
+ private static class DoSubmitAccumulativeRunnable
+ extends AccumulativeRunnable<Runnable> implements ActionListener {
+ private final static int DELAY = (int) (1000 / 30);
+ @Override
+ protected void run(List<Runnable> args) {
+ int i = 0;
+ try {
+ for (Runnable runnable : args) {
+ i++;
+ runnable.run();
+ }
+ } finally {
+ if (i < args.size()) {
+ /* there was an exception
+ * schedule all the unhandled items for the next time
+ */
+ Runnable argsTail[] = new Runnable[args.size() - i];
+ for (int j = 0; j < argsTail.length; j++) {
+ argsTail[j] = args.get(i + j);
+ }
+ add(true, argsTail);
+ }
+ }
+ }
+ @Override
+ protected void submit() {
+ Timer timer = new Timer(DELAY, this);
+ timer.setRepeats(false);
+ timer.start();
+ }
+ public void actionPerformed(ActionEvent event) {
+ run();
+ }
+ }
+
+ private class SwingWorkerPropertyChangeSupport
+ extends PropertyChangeSupport {
+ SwingWorkerPropertyChangeSupport(Object source) {
+ super(source);
+ }
+ @Override
+ public void firePropertyChange(final PropertyChangeEvent evt) {
+ if (SwingUtilities.isEventDispatchThread()) {
+ super.firePropertyChange(evt);
+ } else {
+ doSubmit.add(
+ new Runnable() {
+ public void run() {
+ SwingWorkerPropertyChangeSupport.this
+ .firePropertyChange(evt);
+ }
+ });
+ }
+ }
+ }
+}
diff --git a/src/test/org/jdesktop/swingworker/SwingWorkerTest.java b/src/test/org/jdesktop/swingworker/SwingWorkerTest.java
new file mode 100644
index 0000000..930bd55
--- /dev/null
+++ b/src/test/org/jdesktop/swingworker/SwingWorkerTest.java
@@ -0,0 +1,294 @@
+/*
+ * $Id: SwingWorkerTest.java,v 1.4 2008/07/25 19:32:28 idk Exp $
+ *
+ * Copyright � 2005 Sun Microsystems, Inc. All rights
+ * reserved. Use is subject to license terms.
+ */
+package org.jdesktop.swingworker;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Exchanger;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.swing.SwingUtilities;
+
+import junit.framework.TestCase;
+
+import org.jdesktop.swingworker.SwingWorker.StateValue;
+
+public class SwingWorkerTest extends TestCase {
+
+ private final static int TIME_OUT = 30;
+ private final static TimeUnit TIME_OUT_UNIT = TimeUnit.SECONDS;
+
+ public static void main(String[] args) {
+ junit.swingui.TestRunner.run(SwingWorkerTest.class);
+ }
+
+
+ // is to be run on a worker thread.
+ public final void testdoInBackground() throws Exception {
+ SwingWorker<Thread,?> test = new SwingWorker<Thread, Object>() {
+ @Override
+ protected Thread doInBackground() throws Exception {
+ return Thread.currentThread();
+ }
+ };
+ test.execute();
+ Thread result = test.get(TIME_OUT, TIME_OUT_UNIT);
+ assertNotNull(result);
+ assertNotSame(Thread.currentThread(), result);
+ }
+
+ //{@code process} gets everything from {@code publish}
+ //should be executed on the EDT
+ public final void testPublishAndProcess() throws Exception {
+ final Exchanger<List<Integer>> listExchanger =
+ new Exchanger<List<Integer>>();
+ final Exchanger<Boolean> boolExchanger =
+ new Exchanger<Boolean>();
+ SwingWorker<List<Integer>,Integer> test =
+ new SwingWorker<List<Integer>, Integer>() {
+ List<Integer> receivedArgs =
+ Collections.synchronizedList(new ArrayList<Integer>());
+ Boolean isOnEDT = Boolean.TRUE;
+ final int NUMBERS = 100;
+ @Override
+ protected List<Integer> doInBackground() throws Exception {
+ List<Integer> ret =
+ Collections.synchronizedList(
+ new ArrayList<Integer>(NUMBERS));
+ for (int i = 0; i < NUMBERS; i++) {
+ publish(i);
+ ret.add(i);
+ }
+ return ret;
+ }
+ @Override
+ protected void process(List<Integer> args) {
+ for(Integer i : args) {
+ receivedArgs.add(i);
+ }
+ isOnEDT = isOnEDT && SwingUtilities.isEventDispatchThread();
+ if (receivedArgs.size() == NUMBERS) {
+ try {
+ boolExchanger.exchange(isOnEDT);
+ listExchanger.exchange(receivedArgs);
+ } catch (InterruptedException ignore) {
+ ignore.printStackTrace();
+ }
+ }
+ }
+ };
+ test.execute();
+ assertTrue(boolExchanger.exchange(null, TIME_OUT, TIME_OUT_UNIT));
+ assertEquals(test.get(TIME_OUT, TIME_OUT_UNIT),
+ listExchanger.exchange(null, TIME_OUT, TIME_OUT_UNIT));
+ }
+
+ // done is executed on the EDT
+ // receives the return value from doInBackground using get()
+ public final void testDone() throws Exception {
+ final String testString = "test";
+ final Exchanger<Boolean> exchanger = new Exchanger<Boolean>();
+ SwingWorker<?,?> test = new SwingWorker<String, Object>() {
+ @Override
+ protected String doInBackground() throws Exception {
+ return testString;
+ }
+ @Override
+ protected void done() {
+ try {
+ exchanger.exchange(
+ testString == get()
+ && SwingUtilities.isEventDispatchThread());
+ } catch (Exception ignore) {
+ }
+ }
+ };
+ test.execute();
+ assertTrue(exchanger.exchange(null, TIME_OUT, TIME_OUT_UNIT));
+ }
+
+ //PropertyChangeListener should be notified on the EDT only
+ public final void testPropertyChange() throws Exception {
+ final Exchanger<Boolean> boolExchanger =
+ new Exchanger<Boolean>();
+ final SwingWorker<?,?> test =
+ new SwingWorker<Object, Object>() {
+ @Override
+ protected Object doInBackground() throws Exception {
+ firePropertyChange("test", null, "test");
+ return null;
+ }
+ };
+ test.addPropertyChangeListener(
+ new PropertyChangeListener() {
+ boolean isOnEDT = true;
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ isOnEDT &= SwingUtilities.isEventDispatchThread();
+ if ("state".equals(evt.getPropertyName())
+ && StateValue.DONE == evt.getNewValue()) {
+ try {
+ boolExchanger.exchange(isOnEDT);
+ } catch (Exception ignore) {
+ ignore.printStackTrace();
+ }
+ }
+ }
+ });
+ test.execute();
+ assertTrue(boolExchanger.exchange(null, TIME_OUT, TIME_OUT_UNIT));
+ }
+
+ //the sequence should be
+ //StateValue.STARTED, done, StateValue.DONE
+ public final void testWorkFlow() throws Exception {
+ final List<Object> goldenSequence =
+ Arrays.asList(new Object[]{StateValue.STARTED, "done",
+ StateValue.DONE});
+ final List<Object> sequence =
+ Collections.synchronizedList(new ArrayList<Object>());
+
+ final Exchanger<List<Object>> listExchanger = new Exchanger<List<Object>>();
+
+ final SwingWorker<?,?> test =
+ new SwingWorker<Object,Object>() {
+ @Override
+ protected Object doInBackground() throws Exception {
+ return null;
+ }
+ @Override
+ protected void done() {
+ sequence.add("done");
+ }
+ };
+ test.addPropertyChangeListener(
+ new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ if ("state".equals(evt.getPropertyName())) {
+ sequence.add(evt.getNewValue());
+ if (StateValue.DONE == evt.getNewValue()) {
+ try {
+ listExchanger.exchange(sequence);
+ } catch (Exception ignore) {
+ ignore.printStackTrace();
+ }
+ }
+ }
+ }
+ });
+ test.execute();
+ assertEquals(goldenSequence,
+ listExchanger.exchange(null, TIME_OUT, TIME_OUT_UNIT));
+ }
+
+ /*
+ * regression test for 6493680
+ * [SwingWorker notifications might be out of order.]
+ */
+ public final void test6493680() throws Exception {
+ final AtomicInteger lastProgressValue = new AtomicInteger(-1);
+ final Exchanger<Boolean> exchanger = new Exchanger<Boolean>();
+ class Test {
+ private final AtomicInteger lastProgressValue =
+ new AtomicInteger(-1);
+ private final Exchanger<Boolean> exchanger =
+ new Exchanger<Boolean>();
+
+ boolean test() throws Exception {
+ TestSwingWorker swingWorker = new TestSwingWorker();
+ swingWorker.addPropertyChangeListener(
+ new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ if ("progress" == evt.getPropertyName()) {
+ lastProgressValue.set((Integer) evt.getNewValue());
+ }
+ }
+ });
+
+ swingWorker.execute();
+ return exchanger.exchange(true);
+ }
+
+ class TestSwingWorker extends SwingWorker<Void, Void> {
+ @Override
+ protected Void doInBackground() throws Exception {
+ for (int i = 0; i <= 100; i++) {
+ Thread.sleep(1);
+ setProgress(i);
+ }
+ return null;
+ }
+ @Override
+ protected void done() {
+ boolean isPassed = (lastProgressValue.get() == 100);
+ try {
+ exchanger.exchange(isPassed);
+ } catch (Exception ingore) {
+ }
+ }
+ }
+ }
+ /*
+ * because timing is involved in this bug we will run the test
+ * NUMBER_OF_TRIES times.
+ * the tes`t passes if it does not fail once.
+ */
+ final int NUMBER_OF_TRIES = 50;
+ for (int i = 0; i < NUMBER_OF_TRIES; i++) {
+ assertTrue((new Test()).test());
+ }
+ }
+ /**
+ * regression test for 6557137
+ * [SwingWorker does not change the state to DONE on exception in done]
+ * (issue 5)
+ */
+ public final void test6557137() throws Exception {
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ SwingWorker<Void, Void> testWorker =
+ new SwingWorker<Void, Void>() {
+ @Override
+ protected Void doInBackground() throws Exception {
+ return null;
+ }
+ @Override
+ protected void done() {
+ Thread.currentThread().setUncaughtExceptionHandler(
+ new Thread.UncaughtExceptionHandler() {
+ public void uncaughtException(Thread t,
+ Throwable e) {
+ // do nothing
+ }
+ });
+ throw new RuntimeException("Test exception. Please ignore");
+ }
+ };
+ testWorker.addPropertyChangeListener(
+ new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ if ("state" == evt.getPropertyName()) {
+ if (SwingWorker.StateValue.DONE == evt.getNewValue()) {
+ latch.countDown();
+ }
+ }
+ }
+ });
+
+ testWorker.execute();
+ if (! latch.await(2, TimeUnit.SECONDS)) {
+ throw new RuntimeException("failed");
+ }
+ }
+}
diff --git a/swing-worker-src-1.1.zip b/swing-worker-src-1.1.zip
deleted file mode 100644
index 626ba56..0000000
Binary files a/swing-worker-src-1.1.zip and /dev/null differ
hooks/post-receive
--
libswingworker-java packaging
More information about the pkg-java-commits
mailing list