Thread: [Japi-cvs] SF.net SVN: japi: [511] libs (Page 2)
Status: Beta
Brought to you by:
christianhujer
|
From: <chr...@us...> - 2007-07-07 09:35:49
|
Revision: 511
http://svn.sourceforge.net/japi/?rev=511&view=rev
Author: christianhujer
Date: 2007-07-07 02:35:46 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
Added io library.
Added Paths:
-----------
libs/io/
libs/io/branches/
libs/io/tags/
libs/io/trunk/
libs/io/trunk/CHANGES
libs/io/trunk/COPYING
libs/io/trunk/CREDITS
libs/io/trunk/INSTALL
libs/io/trunk/LICENSE
libs/io/trunk/MAINTAINERS
libs/io/trunk/NEWS
libs/io/trunk/README
libs/io/trunk/build.xml
libs/io/trunk/module.properties
libs/io/trunk/src/
Property changes on: libs/io/trunk
___________________________________________________________________
Name: svn:ignore
+ classes
dest
developer.properties
dist
docs
Name: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Added: libs/io/trunk/CHANGES
===================================================================
--- libs/io/trunk/CHANGES (rev 0)
+++ libs/io/trunk/CHANGES 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,6 @@
+JAPI LIB IO CHANGLOG
+--------------------
+
+2007
+ Christian Hujer:
+ * Creation
Property changes on: libs/io/trunk/CHANGES
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/io/trunk/COPYING
===================================================================
--- libs/io/trunk/COPYING (rev 0)
+++ libs/io/trunk/COPYING 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, 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 or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+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 give any other recipients of the Program a copy of this License
+along with the Program.
+
+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 Program or any portion
+of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+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 Program, 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 Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) 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; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, 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 executable. However, as a
+special exception, the source code 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.
+
+If distribution of executable or 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 counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program 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.
+
+ 5. 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 Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program 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 to
+this License.
+
+ 7. 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 Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program 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 Program.
+
+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.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program 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.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the 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 Program
+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 Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, 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
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), 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 Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. 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 program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Property changes on: libs/io/trunk/COPYING
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/io/trunk/CREDITS
===================================================================
--- libs/io/trunk/CREDITS (rev 0)
+++ libs/io/trunk/CREDITS 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,4 @@
+The following people have contributed to JAPI Lib IO:
+
+* Christian Hujer <ch...@ri...>
+ Inventor, creator, maintainer
Property changes on: libs/io/trunk/CREDITS
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/io/trunk/INSTALL
===================================================================
--- libs/io/trunk/INSTALL (rev 0)
+++ libs/io/trunk/INSTALL 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,22 @@
+BUILDING / INSTALLING JAPI LIB IO
+---------------------------------
+
+
+Japi Lib IO is a library for Java developers. Because of that, installation
+is not applicable. The rest of the file is concerned with building it only.
+
+To build Japi Lib IO, you need Java 5.0 and Ant 1.6.5. The applications you
+build using Japi Lib net will need Java 5.0 or newer and of course Japi
+Lib Net.
+
+
+To build Japi Lib IO, just run ant in the project's root directory or
+specifying the build.xml in the project's root directory. To find out, what
+other options you have for building Japi Lib IO, try "ant -projecthelp".
+
+
+Usually, you'd just want to use Japi Lib IO in your favorite IDE and include
+all those Japi Lib IO classes that you used directly or indirectly in your
+build. To do so, the easiest way usually is this:
+1. Create a .jar file with the Japi Lib IO classes by running "ant dist".
+2. Include that .jar file in the classpath of your IDE.
Property changes on: libs/io/trunk/INSTALL
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/io/trunk/LICENSE
===================================================================
--- libs/io/trunk/LICENSE (rev 0)
+++ libs/io/trunk/LICENSE 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,9 @@
+JAPI LIB IO LICENSE INFORMATION
+-------------------------------
+
+Japi Lib IO is licensed under GPL. See file COPYING.
+
+Japi Lib IO uses some third part libraries, especially for building. These
+libraries are contained in the lib/ directory and have their own licenses. See
+the corresponding LICENSE-*-files in the common/lib/ directory for the licenses
+of third party libraries.
Property changes on: libs/io/trunk/LICENSE
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/io/trunk/MAINTAINERS
===================================================================
--- libs/io/trunk/MAINTAINERS (rev 0)
+++ libs/io/trunk/MAINTAINERS 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,7 @@
+JAPI LIB NET MAINTAINERS
+------------------------
+
+2007
+ Christian Hujer <ch...@ri...>
+ * Creation
+ * Maintenance
Property changes on: libs/io/trunk/MAINTAINERS
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/io/trunk/NEWS
===================================================================
--- libs/io/trunk/NEWS (rev 0)
+++ libs/io/trunk/NEWS 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,4 @@
+JAPI LIB IO NEWS
+----------------
+
+No news yet.
Property changes on: libs/io/trunk/NEWS
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/io/trunk/README
===================================================================
--- libs/io/trunk/README (rev 0)
+++ libs/io/trunk/README 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,119 @@
+JAPI LIB IO README
+==================
+
+This file contains some important information about Japi Lib IO. You should
+read it first.
+
+
+TABLE OF CONTENTS
+-----------------
+* project description
+* project website
+* system requirements
+* file structure
+* build / installation (see file INSTALL)
+* maintainers / credits (see file CREDITS)
+* project news (see file NEWS)
+* mailing lists
+* license information (see file LICENSE)
+
+
+PROJECT DESCRIPTION
+-------------------
+Japi Lib IO is a subproject of Japi.
+Japi Lib IO is an API for networking.
+Japi is a set of APIs for various purposes.
+
+
+PROJECT WEBSITE
+---------------
+Project homepage: http://japi.sourceforge.net/
+Project website: http://sourceforge.net/projects/japi/
+Project statistics: http://cia.navi.cx/projects/japi
+Subproject homepage: http://japi.sourceforge.net/libs/io/
+
+
+SYSTEM REQUIREMENTS
+-------------------
+Java 5.0
+ Previous versions of Java will not work. Japi uses Generics, autoboxing,
+ static imports, foreach loops, assertions, covariant return types and varargs
+ quite a lot.
+
+Ant 1.6.5
+ Previous versions of Ant might work but are not tested.
+
+
+FILE STRUCTURE
+--------------
+build.xml
+ The build file to build the project with Ant.
+
+common/
+ Directory with libraries and other files that are common to all or most
+ Japi projects / modules.
+
+CHANGES
+ Changelog with significant changes.
+
+COPYING
+ Japi Lib IO license conditions. Note: applies to Japi Lib IO only,
+ not third party libraries.
+
+CREDITS
+ List of project contributors. See also MAINTAINERS.
+
+INSTALL
+ Description of how to build and install Japi Lib IO.
+
+LICENSE
+ File with license information.
+
+MAINTAINERS
+ List of current project maintainers. See also CREDITS.
+
+NEWS
+ Project News.
+
+module.properties
+ File with module-specific settings for common/commonBuild.xml.
+
+README
+ This file.
+
+src/
+ Source files.
+
+
+BUILD / INSTALLATION
+--------------------
+See the file INSTALL.
+
+
+MAINTAINERS / CREDITS
+---------------------
+See the file CREDITS.
+
+
+PROJECT NEWS
+------------
+See the file NEWS.
+
+
+MAILING LISTS
+-------------
+Japi mailing lists are the usual sourceforge hosted sourceforge project
+mailing lists. The current mailing lists are:
+* jap...@li...
+ News for JAPI users and developers (low traffic)
+* jap...@li...
+ japi developer talk list
+* jap...@li...
+ svn commit digest list (named cvs for historic reasons)
+To find out how to subscribe or read the archives, go to:
+ http://sourceforge.net/mail/?group_id=149894
+
+
+LICSENSE INFORMATION
+--------------------
+See the file LICENSE
Property changes on: libs/io/trunk/README
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/io/trunk/build.xml
===================================================================
--- libs/io/trunk/build.xml (rev 0)
+++ libs/io/trunk/build.xml 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ JAPI libs-io is a library for I/O.
+ ~ Copyright (C) 2007 Christian Hujer.
+ ~
+ ~ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ -->
+<!DOCTYPE project [
+ <!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
+]>
+<project name="japi lib net" default="compile">
+
+ &commonBuild;
+
+</project>
Property changes on: libs/io/trunk/build.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ LF
Added: libs/io/trunk/module.properties
===================================================================
--- libs/io/trunk/module.properties (rev 0)
+++ libs/io/trunk/module.properties 2007-07-07 09:35:46 UTC (rev 511)
@@ -0,0 +1,24 @@
+#
+# JAPI libs-io is a library for IO.
+# Copyright (C) 2007 Christian Hujer.
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+update.focus=none
+module.version=trunk
+module.name=japi-lib-io
+module.shortname=io
+module.title=IO
Property changes on: libs/io/trunk/module.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-07-07 09:54:42
|
Revision: 515
http://svn.sourceforge.net/japi/?rev=515&view=rev
Author: christianhujer
Date: 2007-07-07 02:54:41 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
Updated Copier and Forwarder to match new code conventions / warnings policy.
Modified Paths:
--------------
libs/io/trunk/src/net/sf/japi/io/Copier.java
libs/net/trunk/src/net/sf/japi/net/Forwarder.java
Modified: libs/io/trunk/src/net/sf/japi/io/Copier.java
===================================================================
--- libs/io/trunk/src/net/sf/japi/io/Copier.java 2007-07-07 09:49:53 UTC (rev 514)
+++ libs/io/trunk/src/net/sf/japi/io/Copier.java 2007-07-07 09:54:41 UTC (rev 515)
@@ -21,12 +21,12 @@
package net.sf.japi.io;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
/** A Runnable that copies from an InputStream to an OutputStream.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class Copier implements Runnable {
Modified: libs/net/trunk/src/net/sf/japi/net/Forwarder.java
===================================================================
--- libs/net/trunk/src/net/sf/japi/net/Forwarder.java 2007-07-07 09:49:53 UTC (rev 514)
+++ libs/net/trunk/src/net/sf/japi/net/Forwarder.java 2007-07-07 09:54:41 UTC (rev 515)
@@ -21,33 +21,34 @@
package net.sf.japi.net;
+import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
-import java.io.IOException;
import net.sf.japi.io.Copier;
/** This class forwards incoming TCP connections to another host and port.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class Forwarder implements Runnable {
/** Main program.
* @param args command line arguments (currently ignored)
+ * @throws IOException In case of I/O problems.
*/
public static void main(final String... args) throws IOException {
- ServerSocket serverSocket = null;
- serverSocket = new ServerSocket(Integer.parseInt(args[0]));
+ final ServerSocket serverSocket = new ServerSocket(Integer.parseInt(args[0]));
+ //noinspection InfiniteLoopStatement
while (true) {
final Socket server = serverSocket.accept();
- Socket client = null;
try {
- client = new Socket(args[1], Integer.parseInt(args[2]));
+ final Socket client = new Socket(args[1], Integer.parseInt(args[2]));
new Forwarder(client, server).start();
} catch (final IOException e) {
- //noinspection CatchGenericClass,OverlyBroadCatchBlock
- try { server.close(); } catch (final Exception ignore) { /* ignore */ }
- //noinspection CatchGenericClass,OverlyBroadCatchBlock
- try { client.close(); } catch (final Exception ignore) { /* ignore */ }
+ try {
+ server.close();
+ } catch (final IOException ignore) {
+ /* ignore */
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-07-09 21:44:50
|
Revision: 529
http://svn.sourceforge.net/japi/?rev=529&view=rev
Author: christianhujer
Date: 2007-07-09 14:44:48 -0700 (Mon, 09 Jul 2007)
Log Message:
-----------
Updated default ant target to be all instead of compile.
Modified Paths:
--------------
libs/argparser/trunk/build.xml
libs/io/trunk/build.xml
libs/lang/trunk/build.xml
libs/logging/trunk/build.xml
libs/net/trunk/build.xml
libs/registry/trunk/build.xml
libs/swing-about/trunk/build.xml
libs/swing-action/trunk/build.xml
libs/swing-app/trunk/build.xml
libs/swing-bookmarks/trunk/build.xml
libs/swing-extlib/trunk/build.xml
libs/swing-font/trunk/build.xml
libs/swing-keyprefs/trunk/build.xml
libs/swing-misc/trunk/build.xml
libs/swing-prefs/trunk/build.xml
libs/swing-proxyprefs/trunk/build.xml
libs/swing-recent/trunk/build.xml
libs/swing-tod/trunk/build.xml
libs/swing-treetable/trunk/build.xml
libs/taglets/trunk/build.xml
libs/util/trunk/build.xml
libs/xml/trunk/build.xml
Modified: libs/argparser/trunk/build.xml
===================================================================
--- libs/argparser/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/argparser/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib argparser" default="compile">
+<project name="japi lib argparser" default="all">
&commonBuild;
Modified: libs/io/trunk/build.xml
===================================================================
--- libs/io/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/io/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib net" default="compile">
+<project name="japi lib net" default="all">
&commonBuild;
Modified: libs/lang/trunk/build.xml
===================================================================
--- libs/lang/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/lang/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib lang" default="compile">
+<project name="japi lib lang" default="all">
&commonBuild;
Modified: libs/logging/trunk/build.xml
===================================================================
--- libs/logging/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/logging/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib logging" default="compile">
+<project name="japi lib logging" default="all">
&commonBuild;
Modified: libs/net/trunk/build.xml
===================================================================
--- libs/net/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/net/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib net" default="compile">
+<project name="japi lib net" default="all">
&commonBuild;
Modified: libs/registry/trunk/build.xml
===================================================================
--- libs/registry/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/registry/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib registry" default="compile">
+<project name="japi lib registry" default="all">
&commonBuild;
Modified: libs/swing-about/trunk/build.xml
===================================================================
--- libs/swing-about/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-about/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-about" default="compile">
+<project name="japi lib swing-about" default="all">
&commonBuild;
Modified: libs/swing-action/trunk/build.xml
===================================================================
--- libs/swing-action/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-action/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-action" default="compile">
+<project name="japi lib swing-action" default="all">
&commonBuild;
Modified: libs/swing-app/trunk/build.xml
===================================================================
--- libs/swing-app/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-app/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-app" default="compile">
+<project name="japi lib swing-app" default="all">
&commonBuild;
Modified: libs/swing-bookmarks/trunk/build.xml
===================================================================
--- libs/swing-bookmarks/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-bookmarks/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-bookmarks" default="compile">
+<project name="japi lib swing-bookmarks" default="all">
&commonBuild;
Modified: libs/swing-extlib/trunk/build.xml
===================================================================
--- libs/swing-extlib/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-extlib/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-extlib" default="compile">
+<project name="japi lib swing-extlib" default="all">
&commonBuild;
Modified: libs/swing-font/trunk/build.xml
===================================================================
--- libs/swing-font/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-font/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-font" default="compile">
+<project name="japi lib swing-font" default="all">
&commonBuild;
Modified: libs/swing-keyprefs/trunk/build.xml
===================================================================
--- libs/swing-keyprefs/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-keyprefs/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-keyprefs" default="compile">
+<project name="japi lib swing-keyprefs" default="all">
&commonBuild;
Modified: libs/swing-misc/trunk/build.xml
===================================================================
--- libs/swing-misc/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-misc/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing misc" default="compile">
+<project name="japi lib swing misc" default="all">
&commonBuild;
Modified: libs/swing-prefs/trunk/build.xml
===================================================================
--- libs/swing-prefs/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-prefs/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-prefs" default="compile">
+<project name="japi lib swing-prefs" default="all">
&commonBuild;
Modified: libs/swing-proxyprefs/trunk/build.xml
===================================================================
--- libs/swing-proxyprefs/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-proxyprefs/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-proxyprefs" default="compile">
+<project name="japi lib swing-proxyprefs" default="all">
&commonBuild;
Modified: libs/swing-recent/trunk/build.xml
===================================================================
--- libs/swing-recent/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-recent/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-recent" default="compile">
+<project name="japi lib swing-recent" default="all">
&commonBuild;
Modified: libs/swing-tod/trunk/build.xml
===================================================================
--- libs/swing-tod/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-tod/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-tod" default="compile">
+<project name="japi lib swing-tod" default="all">
&commonBuild;
Modified: libs/swing-treetable/trunk/build.xml
===================================================================
--- libs/swing-treetable/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/swing-treetable/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib swing-treetable" default="compile">
+<project name="japi lib swing-treetable" default="all">
&commonBuild;
Modified: libs/taglets/trunk/build.xml
===================================================================
--- libs/taglets/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/taglets/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib taglets" default="compile">
+<project name="japi lib taglets" default="all">
&commonBuild;
Modified: libs/util/trunk/build.xml
===================================================================
--- libs/util/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/util/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib util" default="compile">
+<project name="japi lib util" default="all">
&commonBuild;
Modified: libs/xml/trunk/build.xml
===================================================================
--- libs/xml/trunk/build.xml 2007-07-09 21:36:57 UTC (rev 528)
+++ libs/xml/trunk/build.xml 2007-07-09 21:44:48 UTC (rev 529)
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
]>
-<project name="japi lib xml" default="compile">
+<project name="japi lib xml" default="all">
&commonBuild;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-07-14 09:49:50
|
Revision: 534
http://svn.sourceforge.net/japi/?rev=534&view=rev
Author: christianhujer
Date: 2007-07-14 02:49:47 -0700 (Sat, 14 Jul 2007)
Log Message:
-----------
Added swing-list.
Added Paths:
-----------
libs/swing-list/
libs/swing-list/trunk/
libs/swing-list/trunk/libs-swing-list.iml
libs/swing-list/trunk/src/
libs/swing-list/trunk/src/net/
libs/swing-list/trunk/src/net/sf/
libs/swing-list/trunk/src/net/sf/japi/
libs/swing-list/trunk/src/net/sf/japi/swing/
libs/swing-list/trunk/src/net/sf/japi/swing/list/
libs/swing-list/trunk/src/net/sf/japi/swing/list/AbstractMutableListModel.java
libs/swing-list/trunk/src/net/sf/japi/swing/list/ArrayListModel.java
libs/swing-list/trunk/src/net/sf/japi/swing/list/MutableListModel.java
libs/swing-list/trunk/src/net/sf/japi/swing/list/package-info.java
libs/swing-list/trunk/src/test/
libs/swing-list/trunk/src/test/net/
libs/swing-list/trunk/src/test/net/sf/
libs/swing-list/trunk/src/test/net/sf/japi/
libs/swing-list/trunk/src/test/net/sf/japi/swing/
libs/swing-list/trunk/src/test/net/sf/japi/swing/list/
libs/swing-list/trunk/src/test/net/sf/japi/swing/list/ArrayListModelTest.java
libs/swing-list/trunk/src/test/net/sf/japi/swing/list/MockListDataListener.java
libs/swing-list/trunk/src/test/net/sf/japi/swing/list/package-info.java
Property changes on: libs/swing-list/trunk
___________________________________________________________________
Name: svn:ignore
+ classes
dest
developer.properties
dist
docs
Name: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Added: libs/swing-list/trunk/libs-swing-list.iml
===================================================================
--- libs/swing-list/trunk/libs-swing-list.iml (rev 0)
+++ libs/swing-list/trunk/libs-swing-list.iml 2007-07-14 09:49:47 UTC (rev 534)
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntryProperties />
+ </component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="0" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JAPI libs-swing-list is a library for lists in swing. Copyright (C) &#36;today.year Christian Hujer. 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
+</module>
+
Property changes on: libs/swing-list/trunk/libs-swing-list.iml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ LF
Added: libs/swing-list/trunk/src/net/sf/japi/swing/list/AbstractMutableListModel.java
===================================================================
--- libs/swing-list/trunk/src/net/sf/japi/swing/list/AbstractMutableListModel.java (rev 0)
+++ libs/swing-list/trunk/src/net/sf/japi/swing/list/AbstractMutableListModel.java 2007-07-14 09:49:47 UTC (rev 534)
@@ -0,0 +1,28 @@
+/*
+ * JAPI libs-swing-list is a library for lists in swing.
+ * Copyright (C) 2007 Christian Hujer.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package net.sf.japi.swing.list;
+
+import javax.swing.AbstractListModel;
+
+/** The abstract definition for the data model that provides a List with its contents in a mutable fashion.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public abstract class AbstractMutableListModel<E> extends AbstractListModel implements MutableListModel<E> {
+} // class AbstractMutableListModel
Property changes on: libs/swing-list/trunk/src/net/sf/japi/swing/list/AbstractMutableListModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/swing-list/trunk/src/net/sf/japi/swing/list/ArrayListModel.java
===================================================================
--- libs/swing-list/trunk/src/net/sf/japi/swing/list/ArrayListModel.java (rev 0)
+++ libs/swing-list/trunk/src/net/sf/japi/swing/list/ArrayListModel.java 2007-07-14 09:49:47 UTC (rev 534)
@@ -0,0 +1,174 @@
+/*
+ * JAPI libs-swing-list is a library for lists in swing.
+ * Copyright (C) 2007 Christian Hujer.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package net.sf.japi.swing.list;
+
+import java.util.List;
+import java.util.ArrayList;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class ArrayListModel<E> extends AbstractMutableListModel<E> {
+
+ /** The ArrayList that backs this ArrayListModel. */
+ private final List<E> list = new ArrayList<E>();
+
+ /** Creates a new ArrayListModel.
+ */
+ public ArrayListModel() {
+ }
+
+ /** {@inheritDoc} */
+ public int getSize() {
+ return list.size();
+ }
+
+ /** {@inheritDoc} */
+ public E getElementAt(final int index) {
+ return list.get(index);
+ }
+
+ /** {@inheritDoc} */
+ public boolean add(final E e) {
+ if (list.contains(e)) {
+ return false;
+ }
+ final int index;
+ final boolean retVal;
+ synchronized (list) {
+ index = list.size();
+ retVal = list.add(e);
+ }
+ fireIntervalAdded(this, index, index);
+ return retVal;
+ }
+
+ /** {@inheritDoc} */
+ public boolean remove(final E e) {
+ if (!list.contains(e)) {
+ return false;
+ }
+ final int index;
+ final boolean retVal;
+ synchronized (list) {
+ index = list.indexOf(e);
+ retVal = list.remove(e);
+ }
+ fireIntervalRemoved(this, index, index);
+ return retVal;
+ }
+
+ /** {@inheritDoc} */
+ public boolean moveToTop(final E e) {
+ synchronized (list) {
+ if (!list.contains(e)) {
+ throw new IllegalArgumentException("Element " + e + " not part of " + this);
+ }
+ final int oldIndex = list.indexOf(e);
+ final int newIndex = 0;
+ return move(e, oldIndex, newIndex);
+ }
+
+ }
+
+ /** {@inheritDoc} */
+ public boolean moveToTop(final int index) {
+ synchronized (list) {
+ return move(null, index, 0);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean moveUp(final E e) {
+ synchronized (list) {
+ if (!list.contains(e)) {
+ throw new IllegalArgumentException("Element " + e + " not part of " + this);
+ }
+ final int oldIndex = list.indexOf(e);
+ final int newIndex = oldIndex - 1;
+ return move(e, oldIndex, newIndex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean moveUp(final int index) {
+ synchronized (list) {
+ return move(null, index, index - 1);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean moveDown(final E e) {
+ synchronized (list) {
+ if (!list.contains(e)) {
+ throw new IllegalArgumentException("Element " + e + " not part of " + this);
+ }
+ final int oldIndex = list.indexOf(e);
+ final int newIndex = oldIndex + 1;
+ return move(e, oldIndex, newIndex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean moveDown(final int index) {
+ synchronized (list) {
+ return move(null, index, index + 1);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean moveToBottom(final E e) {
+ synchronized (list) {
+ if (!list.contains(e)) {
+ throw new IllegalArgumentException("Element " + e + " not part of " + this);
+ }
+ final int oldIndex = list.indexOf(e);
+ final int newIndex = list.size() - 1;
+ return move(e, oldIndex, newIndex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean moveToBottom(final int index) {
+ synchronized (list) {
+ return move(null, index, list.size() - 1);
+ }
+ }
+
+ /** Performs the move operation of an element.
+ * @param e Element to move
+ * @param oldIndex old index of the element
+ * @param newIndex new index of the element
+ * @return <code>true</code> if the element was moved and the event was fired, otherwise <code>false</code>.
+ */
+ private boolean move(@Nullable final E e, final int oldIndex, final int newIndex) {
+ if (oldIndex == newIndex || oldIndex < 0 || newIndex < 0 || newIndex >= list.size()) {
+ return false;
+ }
+ assert e == null || list.indexOf(e) == oldIndex;
+ final E moving = list.remove(oldIndex);
+ list.add(newIndex, moving);
+ assert e == null || list.indexOf(e) == newIndex;
+ fireContentsChanged(this, oldIndex, newIndex);
+ return true;
+ }
+
+} // class ArrayListModel
Property changes on: libs/swing-list/trunk/src/net/sf/japi/swing/list/ArrayListModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/swing-list/trunk/src/net/sf/japi/swing/list/MutableListModel.java
===================================================================
--- libs/swing-list/trunk/src/net/sf/japi/swing/list/MutableListModel.java (rev 0)
+++ libs/swing-list/trunk/src/net/sf/japi/swing/list/MutableListModel.java 2007-07-14 09:49:47 UTC (rev 534)
@@ -0,0 +1,92 @@
+/*
+ * JAPI libs-swing-list is a library for lists in swing.
+ * Copyright (C) 2007 Christian Hujer.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package net.sf.japi.swing.list;
+
+import javax.swing.ListModel;
+
+/** A MutableListModel is a list model that additionally provides operations for adding and moving the list's elements.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public interface MutableListModel<E> extends ListModel {
+
+ /** {@inheritDoc} */
+ E getElementAt(final int index);
+
+ /** Addes the specified element to this model.
+ * @param e Element to add.
+ * @return <code>true</code> if the element was successfully added, otherwise <code>false</code>.
+ */
+ boolean add(E e);
+
+ /** Removes the specified element from this model.
+ * @param e Element to remove.
+ * @return <code>true</code> if the element was successfully removed, otherwise <code>false</code>.
+ */
+ boolean remove(E e);
+
+ /** Moves the specified element to top.
+ * @param e Element to move to top.
+ * @return <code>true</code> if the move was successful, otherwise <code>false</code>.
+ */
+ boolean moveToTop(E e);
+
+ /** Moves the element with the specified index to top.
+ * @param index Index of the element to move to top.
+ * @return <code>true</code> if the move was successful, otherwise <code>false</code>.
+ */
+ boolean moveToTop(int index);
+
+ /** Moves the specified element up.
+ * @param e Element to move up.
+ * @return <code>true</code> if the move was successful, otherwise <code>false</code>.
+ */
+ boolean moveUp(E e);
+
+ /** Moves the element with the specified index up.
+ * @param index Index of the element to move up.
+ * @return <code>true</code> if the move was successful, otherwise <code>false</code>.
+ */
+ boolean moveUp(int index);
+
+ /** Moves the specified element down.
+ * @param e Element to move down.
+ * @return <code>true</code> if the move was successful, otherwise <code>false</code>.
+ */
+ boolean moveDown(E e);
+
+ /** Moves the element with the specified index down.
+ * @param index Index of the element to move down.
+ * @return <code>true</code> if the move was successful, otherwise <code>false</code>.
+ */
+ boolean moveDown(int index);
+
+ /** Moves the specified element to bottom.
+ * @param e Element to move to bottom.
+ * @return <code>true</code> if the move was successful, otherwise <code>false</code>.
+ */
+ boolean moveToBottom(E e);
+
+ /** Moves the element with the specified index to bottom.
+ * @param index Index of the element to move to bottom.
+ * @return <code>true</code> if the move was successful, otherwise <code>false</code>.
+ */
+ boolean moveToBottom(int index);
+
+} // interface MutableListModel
Property changes on: libs/swing-list/trunk/src/net/sf/japi/swing/list/MutableListModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/swing-list/trunk/src/net/sf/japi/swing/list/package-info.java
===================================================================
--- libs/swing-list/trunk/src/net/sf/japi/swing/list/package-info.java (rev 0)
+++ libs/swing-list/trunk/src/net/sf/japi/swing/list/package-info.java 2007-07-14 09:49:47 UTC (rev 534)
@@ -0,0 +1,20 @@
+/*
+ * JAPI libs-swing-list is a library for lists in swing.
+ * Copyright (C) 2007 Christian Hujer.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package net.sf.japi.swing.list;
Property changes on: libs/swing-list/trunk/src/net/sf/japi/swing/list/package-info.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/swing-list/trunk/src/test/net/sf/japi/swing/list/ArrayListModelTest.java
===================================================================
--- libs/swing-list/trunk/src/test/net/sf/japi/swing/list/ArrayListModelTest.java (rev 0)
+++ libs/swing-list/trunk/src/test/net/sf/japi/swing/list/ArrayListModelTest.java 2007-07-14 09:49:47 UTC (rev 534)
@@ -0,0 +1,242 @@
+/*
+ * JAPI libs-swing-list is a library for lists in swing.
+ * Copyright (C) 2007 Christian Hujer.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package test.net.sf.japi.swing.list;
+
+import javax.swing.event.ListDataEvent;
+import net.sf.japi.swing.list.ArrayListModel;
+import org.jetbrains.annotations.NotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+/** Test for {@link ArrayListModel}.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class ArrayListModelTest {
+
+ /** Tests that an empty ArrayListModel behaves as expected. */
+ @Test
+ public void testEmpty() {
+ final ArrayListModel testling = new ArrayListModel();
+ assertEquals("Newly created ArrayListModel must contain no elements.", 0, testling.getSize());
+ }
+
+ /** Tests that an ArrayListModel with one element behaves as expected. */
+ @Test
+ public void testSingle() {
+ final ArrayListModel<String> testling = new ArrayListModel<String>();
+ final String foo = "foo";
+ testling.add(foo);
+ assertEquals("ArrayListModel now must contain one element.", 1, testling.getSize());
+ assertSame("ArrayListModel must return the stored element.", foo, testling.getElementAt(0));
+ }
+
+ /** Tests that an ArrayListModel with one element does not accept duplicates. */
+ @Test
+ public void testSingleDuplicate() {
+ final ArrayListModel<String> testling = new ArrayListModel<String>();
+ final String foo = "foo";
+ testling.add(foo);
+ testling.add(foo);
+ assertEquals("ArrayListModel now must contain one element.", 1, testling.getSize());
+ assertSame("ArrayListModel must return the stored element.", foo, testling.getElementAt(0));
+ }
+
+ /** Tests that the move operations with elements work as expected for non-exception cases. */
+ @Test
+ public void testMoveElement() {
+ final ArrayListModel<String> testling = new ArrayListModel<String>();
+ final String test1 = "Test1";
+ final String test2 = "Test2";
+ final String test3 = "Test3";
+ final String test4 = "Test4";
+ final String test5 = "Test5";
+ assertTrue("Adding " + test1 + " must work.", testling.add(test1));
+ assertTrue("Adding " + test1 + " must work.", testling.add(test2));
+ assertTrue("Adding " + test1 + " must work.", testling.add(test3));
+ assertTrue("Adding " + test1 + " must work.", testling.add(test4));
+ assertTrue("Adding " + test1 + " must work.", testling.add(test5));
+ assertMove("Original order must match.", testling, test1, test2, test3, test4, test5);
+ assertTrue("Moving " + test5 + " to top must work.", testling.moveToTop(test5));
+ assertMove("Test5 now must be first.", testling, test5, test1, test2, test3, test4);
+ assertFalse("Moving " + test5 + " to top must fail.", testling.moveToTop(test5));
+ assertMove("Test5 now must still be first.", testling, test5, test1, test2, test3, test4);
+ assertTrue("Moving " + test5 + " down must work.", testling.moveDown(test5));
+ assertMove("Test5 now must be second.", testling, test1, test5, test2, test3, test4);
+ assertTrue("Moving " + test5 + " down must work.", testling.moveDown(test5));
+ assertMove("Test5 now must be third.", testling, test1, test2, test5, test3, test4);
+ assertTrue("Moving " + test5 + " down must work.", testling.moveDown(test5));
+ assertMove("Test5 now must be fourth.", ...
[truncated message content] |
|
From: <chr...@us...> - 2007-08-15 16:41:43
|
Revision: 581
http://japi.svn.sourceforge.net/japi/?rev=581&view=rev
Author: christianhujer
Date: 2007-08-15 09:41:40 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Added missing @NotNull / @Nullable annotations.
Modified Paths:
--------------
libs/lang/trunk/src/net/sf/japi/lang/PropertyComparator.java
libs/lang/trunk/src/net/sf/japi/lang/SuperClassIterator.java
libs/net/trunk/src/net/sf/japi/net/Forwarder.java
Modified: libs/lang/trunk/src/net/sf/japi/lang/PropertyComparator.java
===================================================================
--- libs/lang/trunk/src/net/sf/japi/lang/PropertyComparator.java 2007-08-15 16:40:40 UTC (rev 580)
+++ libs/lang/trunk/src/net/sf/japi/lang/PropertyComparator.java 2007-08-15 16:41:40 UTC (rev 581)
@@ -42,7 +42,7 @@
@Nullable private final Comparator<T> delegate;
/** The name of the property to get. */
- private final String propertyName;
+ @NotNull private final String propertyName;
/** The getter to read the property. */
@Nullable private final Method getter;
@@ -113,7 +113,7 @@
/** Returns the property name of the property that's compared by this PropertyComparator.
* @return Property name.
*/
- public String getPropertyName() {
+ @NotNull public String getPropertyName() {
return propertyName;
}
Modified: libs/lang/trunk/src/net/sf/japi/lang/SuperClassIterator.java
===================================================================
--- libs/lang/trunk/src/net/sf/japi/lang/SuperClassIterator.java 2007-08-15 16:40:40 UTC (rev 580)
+++ libs/lang/trunk/src/net/sf/japi/lang/SuperClassIterator.java 2007-08-15 16:41:40 UTC (rev 581)
@@ -21,6 +21,7 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -47,7 +48,7 @@
}
/** {@inheritDoc} */
- public Class<?> next() {
+ @NotNull public Class<?> next() {
if (nextClass == null) {
throw new NoSuchElementException();
}
@@ -64,7 +65,7 @@
}
/** {@inheritDoc} */
- public Iterator<Class<?>> iterator() {
+ @NotNull public Iterator<Class<?>> iterator() {
return this;
}
Modified: libs/net/trunk/src/net/sf/japi/net/Forwarder.java
===================================================================
--- libs/net/trunk/src/net/sf/japi/net/Forwarder.java 2007-08-15 16:40:40 UTC (rev 580)
+++ libs/net/trunk/src/net/sf/japi/net/Forwarder.java 2007-08-15 16:41:40 UTC (rev 581)
@@ -25,6 +25,7 @@
import java.net.ServerSocket;
import java.net.Socket;
import net.sf.japi.io.Copier;
+import org.jetbrains.annotations.NotNull;
/** This class forwards incoming TCP connections to another host and port.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -55,16 +56,16 @@
}
/** First socket. */
- private final Socket s1;
+ @NotNull private final Socket s1;
/** Second socket. */
- private final Socket s2;
+ @NotNull private final Socket s2;
/** Create a new Forwarder.
* @param s1 first socket
* @param s2 second socket
*/
- public Forwarder(final Socket s1, final Socket s2) {
+ public Forwarder(@NotNull final Socket s1, @NotNull final Socket s2) {
this.s1 = s1;
this.s2 = s2;
}
@@ -86,10 +87,8 @@
} catch (final IOException e) {
e.printStackTrace(); //TODO
} finally {
- //noinspection CatchGenericClass,OverlyBroadCatchBlock
- try { s1.close(); } catch (final Exception ignore) { /* ignore */ }
- //noinspection CatchGenericClass,OverlyBroadCatchBlock
- try { s2.close(); } catch (final Exception ignore) { /* ignore */ }
+ try { s1.close(); } catch (final IOException ignore) { /* ignore */ }
+ try { s2.close(); } catch (final IOException ignore) { /* ignore */ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|