Thread: [Japi-cvs] SF.net SVN: japi: [294] tools
Status: Beta
Brought to you by:
christianhujer
From: <chr...@us...> - 2007-01-14 17:51:35
|
Revision: 294 http://svn.sourceforge.net/japi/?rev=294&view=rev Author: christianhujer Date: 2007-01-14 09:51:34 -0800 (Sun, 14 Jan 2007) Log Message: ----------- Added string2bytes. Added Paths: ----------- tools/string2bytes/ tools/string2bytes/branches/ tools/string2bytes/tags/ tools/string2bytes/trunk/ tools/string2bytes/trunk/COPYING tools/string2bytes/trunk/build.xml tools/string2bytes/trunk/lib/ tools/string2bytes/trunk/lib/LICENSE-Pack200Task.jar tools/string2bytes/trunk/lib/LICENSE-annotations.jar tools/string2bytes/trunk/lib/LICENSE-japi-libs tools/string2bytes/trunk/lib/Pack200Task.jar tools/string2bytes/trunk/lib/annotations.jar tools/string2bytes/trunk/lib/japi-lib-lang-0.1.jar tools/string2bytes/trunk/lib/japi-lib-swing-about-0.1.jar tools/string2bytes/trunk/lib/japi-lib-swing-action-0.1.jar tools/string2bytes/trunk/src/ tools/string2bytes/trunk/src/net/ tools/string2bytes/trunk/src/net/sf/ tools/string2bytes/trunk/src/net/sf/japi/ tools/string2bytes/trunk/src/net/sf/japi/string2bytes/ tools/string2bytes/trunk/src/net/sf/japi/string2bytes/EntityCodec.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/IdentityCodec.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/JavaBytesCodec.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/String2Bytes.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/StringCodec.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/URLEncodeCodec.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/action.properties tools/string2bytes/trunk/string2bytes-0.1.jar tools/string2bytes/trunk/string2bytes.iml Added: tools/string2bytes/trunk/COPYING =================================================================== --- tools/string2bytes/trunk/COPYING (rev 0) +++ tools/string2bytes/trunk/COPYING 2007-01-14 17:51:34 UTC (rev 294) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, 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 Lesser 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 Street, 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 Lesser General +Public License instead of this License. Property changes on: tools/string2bytes/trunk/COPYING ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + LF Added: tools/string2bytes/trunk/build.xml =================================================================== --- tools/string2bytes/trunk/build.xml (rev 0) +++ tools/string2bytes/trunk/build.xml 2007-01-14 17:51:34 UTC (rev 294) @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="utf-8"?> +<project name="string2bytes" default="compile"> + + <property name="module.version" value="0.1" /> + <property name="module.name" value="string2bytes" /> + <property name="module.shortname" value="string2bytes" /> + <property name="module.title" value="String2Bytes" /> + <property name="main.class" value="net.sf.japi.string2bytes.String2Bytes" /> + + <taskdef name="pack200" classpath="lib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" /> + + <target + name = "clean" + description = "Cleans Sandbox" + > + <delete dir="classes" /> + <delete dir="docs" /> + </target> + + <target + name = "compile" + description = "Compiles production classes" + > + <mkdir dir="classes/production/${module.shortname}" /> + <mkdir dir="classes/test/${module.shortname}" /> + <javac + srcdir="src" + destdir="classes/production/${module.shortname}" + encoding="utf-8" + source="1.5" + target="1.5" + > + <classpath> + <fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" /> + </classpath> + <exclude name="test/**/*.java" /> + </javac> + <copy + todir="classes/production/${module.shortname}" + > + <fileset dir="src" includes="**/*.properties" excludes="test/**/*.properties" /> + <fileset dir="src" includes="META-INF/services/**" /> + </copy> + <copy + todir="classes/production/${module.shortname}" + > + <fileset dir="lib" includes="LICENSE-*" /> + <fileset dir="." includes="COPYING" /> + </copy> + </target> + + <target + name = "dist" + description = "Packs distribution archives." + depends = "clean, compile" + > + <!--depends = "clean, compile, doc" + --> + <delete dir="dist" /> + <mkdir dir="dist" /> + <property name="distName" value="dist/${module.name}-${module.version}" /> + <parallel> + <tar tarfile="${distName}.src.tar"> + <tarfileset dir="." prefix="${module.name}-${module.version}"> + <include name="src/**" /> + <include name="build.xml" /> + </tarfileset> + </tar> + <zip destfile="${distName}.src.zip"> + <zipfileset dir="." prefix="${module.name}-${module.version}"> + <include name="src/**" /> + <include name="build.xml" /> + </zipfileset> + </zip> + <jar destfile="${distName}.src.jar"> + <zipfileset dir="." prefix="${module.name}-${module.version}"> + <include name="src/**" /> + <include name="build.xml" /> + </zipfileset> + </jar> + <jar destfile="${distName}.jar"> + <zipfileset dir="classes/production/${module.shortname}"/> + <manifest> + <attribute name="Main-Class" value="${main.class}" /> + <attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /> + <attribute name="Implementation-Title" value="${module.name}" /> + <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" /> + <attribute name="Implementation-Version" value="${module.version}" /> + <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" /> + </manifest> + </jar> + <tar tarfile="${distName}.doc.tar"> + <tarfileset dir="." prefix="${module.name}-${module.version}"> + <include name="docs/**" /> + <include name="build.xml" /> + </tarfileset> + </tar> + <zip destfile="${distName}.doc.zip"> + <zipfileset dir="." prefix="${module.name}-${module.version}"> + <include name="docs/**" /> + <include name="build.xml" /> + </zipfileset> + </zip> + <jar destfile="${distName}.doc.jar"> + <zipfileset dir="." prefix="${module.name}-${module.version}"> + <include name="docs/**" /> + </zipfileset> + </jar> + </parallel> + <parallel> + <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" /> + <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" /> + <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" /> + <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" /> + <pack200 + src="${distName}.jar" + destfile="${distName}.pack.gz" + gzipoutput="true" + stripdebug="true" + effort="9" + keepfileorder="false" + modificationtime="latest" + deflatehint="false" + /> + </parallel> + <delete file="${distName}.src.tar" /> + <delete file="${distName}.doc.tar" /> + </target> + + <target + name = "doc" + description = "Creates public javadoc documentation." + > + <mkdir dir="docs/api" /> + <!--copy todir="docs/api" file="src/doc/api/public/copyright.html" /> + <copy todir="docs/api" file="src/doc/api/public/.htaccess" /--> + <javadoc + destdir = "docs/api" + access = "protected" + author = "yes" + version = "yes" + locale = "en_US" + use = "yes" + splitindex = "yes" + windowtitle = "JAPI Library ${module.title} ${module.version} API documentation" + doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation" + header = "JAPI Library ${module.title} ${module.version}<br />API Documentation" + footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation" + bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>" + serialwarn = "yes" + charset = "utf-8" + docencoding = "utf-8" + encoding = "utf-8" + source = "1.5" + linksource = "yes" + link = "${user.javadoc.link}" + > + <!-- + overview = "src/overview.html" + --> + <classpath> + <fileset dir="lib" includes="annotations.jar" /> + </classpath> + <sourcepath> + <pathelement path="${user.javadoc.javasrc}" /> + <pathelement path="src" /> + </sourcepath> + <packageset + dir="src" + defaultexcludes="yes" + > + <include name="net/**" /> + </packageset> + <tag enabled="true" name="retval" description="Return Values:" scope="methods" /> + <tag enabled="true" name="pre" description="Preconditions:" scope="methods,constructors" /> + <tag enabled="true" name="post" description="Postconditions:" scope="methods" /> + <tag enabled="true" name="invariant" description="Invariant:" scope="methods,fields" /> + <tag enabled="true" name="note" description="Notes:" /> + <tag enabled="true" name="warning" description="Warnings:" /> + <!--tag enabled="true" name="todo" description="Todo:" /--> + <taglet name="com.sun.tools.doclets.ToDoTaglet" path="" /> + <tag enabled="true" name="fixme" description="Fixme:" /> + <tag enabled="true" name="xxx" description="XXX:" /> + </javadoc> + </target> + +</project> Property changes on: tools/string2bytes/trunk/build.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + LF Added: tools/string2bytes/trunk/lib/LICENSE-Pack200Task.jar =================================================================== --- tools/string2bytes/trunk/lib/LICENSE-Pack200Task.jar (rev 0) +++ tools/string2bytes/trunk/lib/LICENSE-Pack200Task.jar 2007-01-14 17:51:34 UTC (rev 294) @@ -0,0 +1,471 @@ +SUN PUBLIC LICENSE Version 1.0 + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original Code, + prior Modifications used by a Contributor, and the Modifications made + by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the ... [truncated message content] |
From: <chr...@us...> - 2007-06-07 15:01:16
|
Revision: 358 http://svn.sourceforge.net/japi/?rev=358&view=rev Author: christianhujer Date: 2007-06-07 08:01:12 -0700 (Thu, 07 Jun 2007) Log Message: ----------- Added findLongestPath tool skeleton. Added Paths: ----------- tools/findLongestPath/ tools/findLongestPath/branches/ tools/findLongestPath/tags/ tools/findLongestPath/trunk/ tools/findLongestPath/trunk/findLongestPath.iml tools/findLongestPath/trunk/src/ tools/findLongestPath/trunk/src/net/ tools/findLongestPath/trunk/src/net/sf/ tools/findLongestPath/trunk/src/net/sf/japi/ tools/findLongestPath/trunk/src/net/sf/japi/findLongestPath/ Property changes on: tools/findLongestPath/trunk ___________________________________________________________________ Name: svn:externals + common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk Added: tools/findLongestPath/trunk/findLongestPath.iml =================================================================== --- tools/findLongestPath/trunk/findLongestPath.iml (rev 0) +++ tools/findLongestPath/trunk/findLongestPath.iml 2007-06-07 15:01:12 UTC (rev 358) @@ -0,0 +1,187 @@ +<?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" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntryProperties /> + </component> + <component name="copyright"> + <Base> + <setting name="state" value="1" /> + </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="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <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: tools/findLongestPath/trunk/findLongestPath.iml ___________________________________________________________________ Name: svn:mime-type + text/xml 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-06-08 19:48:28
|
Revision: 365 http://svn.sourceforge.net/japi/?rev=365&view=rev Author: christianhujer Date: 2007-06-08 12:48:18 -0700 (Fri, 08 Jun 2007) Log Message: ----------- Added ttb for cstyle tool. Added Paths: ----------- tools/cstyle/ tools/cstyle/branches/ tools/cstyle/tags/ tools/cstyle/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2007-06-09 17:53:27
|
Revision: 376 http://svn.sourceforge.net/japi/?rev=376&view=rev Author: christianhujer Date: 2007-06-09 10:53:25 -0700 (Sat, 09 Jun 2007) Log Message: ----------- Added structure for prefsbrowser. Added Paths: ----------- tools/prefsbrowser/ tools/prefsbrowser/branches/ tools/prefsbrowser/tags/ tools/prefsbrowser/trunk/ Property changes on: tools/prefsbrowser/trunk ___________________________________________________________________ Name: svn:externals + common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2007-06-09 17:53:42
|
Revision: 377 http://svn.sourceforge.net/japi/?rev=377&view=rev Author: christianhujer Date: 2007-06-09 10:53:41 -0700 (Sat, 09 Jun 2007) Log Message: ----------- Added structure for jwget. Added Paths: ----------- tools/jwget/ tools/jwget/branches/ tools/jwget/tags/ tools/jwget/trunk/ Property changes on: tools/jwget/trunk ___________________________________________________________________ Name: svn:externals + common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2007-06-09 17:53:54
|
Revision: 378 http://svn.sourceforge.net/japi/?rev=378&view=rev Author: christianhujer Date: 2007-06-09 10:53:53 -0700 (Sat, 09 Jun 2007) Log Message: ----------- Added structure for keystrokes. Added Paths: ----------- tools/keystrokes/ tools/keystrokes/branches/ tools/keystrokes/tags/ tools/keystrokes/trunk/ Property changes on: tools/keystrokes/trunk ___________________________________________________________________ Name: svn:externals + common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2007-06-09 17:54:08
|
Revision: 379 http://svn.sourceforge.net/japi/?rev=379&view=rev Author: christianhujer Date: 2007-06-09 10:54:06 -0700 (Sat, 09 Jun 2007) Log Message: ----------- Added structure for fontbrowser. Added Paths: ----------- tools/fontbrowser/ tools/fontbrowser/branches/ tools/fontbrowser/tags/ tools/fontbrowser/trunk/ Property changes on: tools/fontbrowser/trunk ___________________________________________________________________ Name: svn:externals + common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2007-08-12 09:02:40
|
Revision: 571 http://japi.svn.sourceforge.net/japi/?rev=571&view=rev Author: christianhujer Date: 2007-08-12 02:02:36 -0700 (Sun, 12 Aug 2007) Log Message: ----------- Renamed ActionFactory to ActionBuilder. Added historic examples to historic module. Removed old action source from historic. Added global IntelliJ IDEA project file for all trunk modules. Modified Paths: -------------- historic/trunk/historic.iml historic/trunk/src/app/net/sf/japi/swing/IconManager.java historic/trunk/src/app/net/sf/japi/swing/JFileChooserButton.java historic/trunk/src/app/net/sf/japi/swing/JSAXErrorHandler.java historic/trunk/src/app/net/sf/japi/swing/LookAndFeelManager.java historic/trunk/src/app/net/sf/japi/swing/TipOfTheDayManager.java historic/trunk/src/app/net/sf/japi/swing/bookmarks/BookmarkManager.java historic/trunk/src/app/net/sf/japi/swing/font/FontChooser.java historic/trunk/src/app/net/sf/japi/swing/font/FontPreview.java historic/trunk/src/app/net/sf/japi/swing/font/FontStyleListCellRenderer.java historic/trunk/src/app/net/sf/japi/swing/prefs/PreferencesPane.java historic/trunk/src/app/overview.html historic/trunk/src/doc/changes.xhtml historic/trunk/src/doc/guide/io/src/GrepJAPI.java historic/trunk/src/doc/guide/start.xhtml historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java historic/trunk/src/doc/guide/swing/action/basic/start.xhtml historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/action.properties historic/trunk/src/doc/guide/swing/action/fromScratch/start.xhtml historic/trunk/src/doc/guide/swing/prefs/keys/build.xml historic/trunk/src/doc/guide/swing/tod/build.xml historic/trunk/src/doc/releasePlan.xhtml historic/trunk/src/doc/tasks.xhtml libs/argparser/trunk/src/net/sf/japi/io/args/package-info.java libs/swing-about/trunk/src/net/sf/japi/swing/about/AboutDialog.java libs/swing-action/trunk/src/net/sf/japi/swing/ActionMethod.java libs/swing-action/trunk/src/net/sf/japi/swing/DisposeAction.java libs/swing-action/trunk/src/net/sf/japi/swing/IconManager.java libs/swing-action/trunk/src/net/sf/japi/swing/ReflectionAction.java libs/swing-action/trunk/src/test/net/sf/japi/swing/ReflectionActionTest.java libs/swing-bookmarks/trunk/src/net/sf/japi/swing/bookmarks/BookmarkManager.java libs/swing-font/trunk/src/net/sf/japi/swing/font/FontChooser.java libs/swing-font/trunk/src/net/sf/japi/swing/font/FontPreview.java libs/swing-font/trunk/src/net/sf/japi/swing/font/FontStyleListCellRenderer.java libs/swing-keyprefs/trunk/src/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java libs/swing-keyprefs/trunk/src/net/sf/japi/swing/prefs/keys/ActionMapNode.java libs/swing-keyprefs/trunk/src/net/sf/japi/swing/prefs/keys/KeyStrokePrefs.java libs/swing-keyprefs/trunk/src/net/sf/japi/swing/prefs/keys/KeyStrokeRootNode.java libs/swing-keyprefs/trunk/src/net/sf/japi/swing/prefs/keys/KeyStrokeTreeTableModel.java libs/swing-list/trunk/src/net/sf/japi/swing/list/ListControlPanel.java libs/swing-misc/trunk/src/net/sf/japi/swing/misc/JFileChooserButton.java libs/swing-misc/trunk/src/net/sf/japi/swing/misc/JSAXErrorHandler.java libs/swing-prefs/trunk/src/net/sf/japi/swing/prefs/PreferencesPane.java libs/swing-tod/trunk/src/net/sf/japi/swing/tod/TipOfTheDayManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/jtest/gui/SettingsPanel.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/AbstractManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/MenuManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/OpenURLPane.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/ToolBarManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/package.html progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/recent/RecentURLsMenu.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/settings/SettingsPane.java progs/jeduca/trunk/src/net/sf/japi/swing/LookAndFeelManager.java tools/fontbrowser/trunk/src/net/sf/japi/tools/fontbrowser/FontBrowser.java tools/keystrokes/trunk/src/net/sf/japi/tools/keystrokes/KeyStrokes.java tools/prefsbrowser/trunk/src/net/sf/japi/tools/prefsbrowser/PrefsBrowser.java tools/prefsbrowser/trunk/src/net/sf/japi/tools/prefsbrowser/PrefsTreeTableModel.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/CodecSelectionPanel.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/DoubleListController.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/ListOrderController.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/String2Bytes.java Added Paths: ----------- historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/PrefsExampleApp.java historic/trunk/src/doc/guide/swing/tod/src/ex/TodExampleApp.java japi.ipr libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilder.java libs/swing-action/trunk/src/test/net/sf/japi/swing/ActionBuilderTest.java Removed Paths: ------------- historic/trunk/src/app/net/sf/japi/swing/ActionFactory.java historic/trunk/src/app/net/sf/japi/swing/ActionMethod.java historic/trunk/src/app/net/sf/japi/swing/ActionProvider.java historic/trunk/src/app/net/sf/japi/swing/DisposeAction.java historic/trunk/src/app/net/sf/japi/swing/DummyAction.java historic/trunk/src/app/net/sf/japi/swing/NamedActionMap.java historic/trunk/src/app/net/sf/japi/swing/ReflectionAction.java historic/trunk/src/app/net/sf/japi/swing/ToggleAction.java historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/App.java historic/trunk/src/doc/guide/swing/tod/src/ex/App.java libs/swing-action/trunk/src/net/sf/japi/swing/ActionFactory.java libs/swing-action/trunk/src/test/net/sf/japi/swing/ActionFactoryTest.java Modified: historic/trunk/historic.iml =================================================================== --- historic/trunk/historic.iml 2007-08-11 22:48:16 UTC (rev 570) +++ historic/trunk/historic.iml 2007-08-12 09:02:36 UTC (rev 571) @@ -5,11 +5,19 @@ <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/app" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/doc/guide/io/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/doc/guide/swing/action/basic/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/doc/guide/swing/action/fromScratch/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/doc/guide/swing/prefs/keys/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/doc/guide/swing/tod/src" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="annotations" level="project" /> <orderEntry type="module" module-name="libs-lang" /> + <orderEntry type="module" module-name="libs-swing-action" /> + <orderEntry type="module" module-name="libs-swing-keyprefs" /> + <orderEntry type="module" module-name="libs-argparser" /> <orderEntryProperties /> </component> <component name="copyright"> Deleted: historic/trunk/src/app/net/sf/japi/swing/ActionFactory.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/ActionFactory.java 2007-08-11 22:48:16 UTC (rev 570) +++ historic/trunk/src/app/net/sf/japi/swing/ActionFactory.java 2007-08-12 09:02:36 UTC (rev 571) @@ -1,1099 +0,0 @@ -/* JAPI - (Yet another (hopefully) useful) Java API - * - * Copyright (C) 2004-2006 Christian Hujer - * - * 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., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -package net.sf.japi.swing; - -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.lang.reflect.Field; -import java.text.MessageFormat; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.ResourceBundle; -import static java.util.ResourceBundle.getBundle; -import java.util.WeakHashMap; -import java.util.ArrayList; -import java.util.prefs.Preferences; -import static java.util.prefs.Preferences.userNodeForPackage; -import javax.swing.AbstractAction; -import javax.swing.Action; -import static javax.swing.Action.ACCELERATOR_KEY; -import static javax.swing.Action.LONG_DESCRIPTION; -import static javax.swing.Action.MNEMONIC_KEY; -import static javax.swing.Action.NAME; -import static javax.swing.Action.SHORT_DESCRIPTION; -import static javax.swing.Action.SMALL_ICON; -import javax.swing.ActionMap; -import javax.swing.Icon; -import javax.swing.JCheckBox; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; -import javax.swing.JToolBar; -import javax.swing.JPopupMenu; -import static javax.swing.KeyStroke.getKeyStroke; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import static net.sf.japi.swing.IconManager.getDefaultIconManager; -import static net.sf.japi.swing.ReflectionAction.REFLECTION_MESSAGE_PROVIDER; -import static net.sf.japi.swing.ReflectionAction.REFLECTION_TARGET; -import static net.sf.japi.swing.ToggleAction.REFLECTION_PROPERTY_NAME; - -/** Class for creating and initializing {@link Action}s that are localized, user configurable and may invoke their final methods using Reflection; - * also handles extremely much useful stuff for i18n/l10n. - * It is meant as a general service for creating Action objects that have some comfort for the programmer in several aspects: - * <ul> - * <li>Allow zero or more ResourceBundles to be used when creating Actions</li> - * <li>Allow zero or more UserPreferences to be used when creating Actions</li> - * <li>Manage an ActionMap to which created Actions are automatically added</li> - * </ul> - * You may choose to use one or more ActionFactories, depending on the size of your application. - * You may use to spread Action configuration information accross one or more ResourceBundles and one or more Preferences, as you wish. - * When looking for values, the Preferences are queried first, in addition order, after that the ResourceBundles, again in addition order, until - * a value was found. The behaviour when no value was found is undefined. - * <h3>Usage</h3> - * The recommended usage is to - * <ol> - * <li> - * create and initialize an ActionFactory similar as the following example code, put it somewhere at the start of your program: - * <pre> - * ActionFactory myActionFactory = ActionFactory.getFactory("MyApplication"); - * myActionFactory.addBundle("com.mycompany.mypackage.myresource"); // not always required - * myActionFactory.addPref(MyClass.class); - * </pre> - * </li> - * <li> - * then use the ActionFactory from anywhere within the application like this: - * <pre> - * ActionFactory myActionFactory = ActionFactory.getFactory("MyApplication"); - * Action myAction = myActionFactory.createAction("load", this); - * </pre> - * </li> - * </ol> - * <p> - * All actions created or initialized by an instance of this class are optionally put into that instance's {@link ActionMap}. - * If they are stored, you can use that map for later retrieval. - * </p> - * <h4>Usage Notes: Factory Name</h4> - * <ul> - * <li> - * The factory name is used to try to load a resource bundle when a bundle is created. - * The factory name is used as package name for the bundle, the bundle name itself is "action". - * Example: When calling <code>ActionFactory.getFactory("net.sf.japi.swing");</code> for the first time, it is tried to load a - * {@link ResourceBundle} named <code>net.sf.japi.swing.actions</code> for that <code>ActionFactory</code>. - * This automatism has been implemented to save you from the need of initializing an ActionFactory before use. - * </li> - * </ul> - * <h4>Usage Notes: Action Key / Action Name</h4> - * The key you supply as first argument of {@link #createAction(boolean, String, Object)} determines several things: - * <ul> - * <li>The base name for the different keys in the preferences / resource bundle and other known Action Keys: - * <table border="1"> - * <tr><th>What</th><th>Preferences / Bundle key</th><th>Action key if stored in an action</th></tr> - * <tr><td>An (somewhat unique) ID</td><td>(<var>basename</var> itself)</td><td>{@link #ACTION_ID}</td></tr> - * <tr><td>The icon</td><td><code><var>basename</var> + ".icon"</code></td><td>{@link Action#SMALL_ICON}</td></tr> - * <tr><td>The tooltip help</td><td><code><var>basename</var> + ".shortdescription"</code></td><td>{@link Action#SHORT_DESCRIPTION}</td></tr> - * <tr><td>The long help</td><td><code><var>basename</var> + ".longdescription"</code></td><td>{@link Action#LONG_DESCRIPTION}</td></tr> - * <tr><td>The text label</td><td><code><var>basename</var> + ".text"</code></td><td>{@link Action#NAME}</td></tr> - * <tr><td>The keyboard accelerator</td><td><code><var>basename</var> + ".accel"</code></td><td>{@link Action#ACCELERATOR_KEY}</td></tr> - * <tr><td>The alternate keyboard accelerator</td><td><code><var>basename</var> + ".accel2"</code></td><td>{@link #ACCELERATOR_KEY_2}</td></tr> - * <tr><td>The mnemonic</td><td><code><var>basename</var> + ".mnemonic"</code></td><td>{@link Action#MNEMONIC_KEY}</td></tr> - * <tr><td>The method name</td><td></td><td>{@link ReflectionAction#REFLECTION_METHOD_NAME}</td></tr> - * <tr><td>The method</td><td></td><td>{@link ReflectionAction#REFLECTION_METHOD}</td></tr> - * <tr><td>The boolean property name</td><td></td><td>{@link ToggleAction#REFLECTION_PROPERTY_NAME}</td></tr> - * <tr><td>The target instance</td><td></td><td>{@link ReflectionAction#REFLECTION_TARGET}</td></tr> - * <tr><td>Exception handler dialogs</td><td><code><var>basename</var> + ".exception." + <var>exception class name</var> + ...</code><br/>The message can be formatted with 1 parameter that will be the localized message of the thrown exception.</td><td>n/a</td></tr> - * </table> - * </li> - * </ul> - * <p>Some methods are not related to actions, yet take base keys:</p> - * <ul> - * <li>The methods for dialogs, e.g. {@link #showMessageDialog(Component, String, Object...)}: - * <table border="1"> - * <tr><th>What</th><th>Preferences / Bundle key</th></tr> - * <tr><td>Dialog title</td><td><code><var>basename</var> + ".title"</code></td></tr> - * <tr><td>Dialog message</td><td><code><var>basename</var> + ".message"</code></td></tr> - * <tr><td>Dialog messagetype </td><td><code><var>basename</var> + ".messagetype"</code><br/>The message type should be one of the message types defined in {@link JOptionPane}, e.g. {@link JOptionPane#PLAIN_MESSAGE}.</td></tr> - * </table> - * </li> - * </ul> - * <h4>Final Notes</h4> - * <ul> - * <li> - * If by having read all this you think it might often be a good idea to use a package name as a factory name: this is completely right and the - * most common way of using an ActionFactory. - * </li> - * <li> - * If you think you're too lazy to hold your own ActionFactory reference and instead more often call {@link #getFactory(String)}, just go ahead - * and do so. - * Looking up created ActionFactories is extremely fast, and of course they are initialized exactly once, not more. - * </li> - * </ul> - * @see AbstractAction - * @see Action - * @see Preferences - * @see ResourceBundle - * @todo think about toolbar interaction - * @todo think about toolbar configuration - * @todo eventually rename this ActionBuilder and provide an ActionBuilderFactory. - * @todo whether a dialog is a onetime dialog should be a property and user configurable - * @author <a href="mailto:ch...@ri...">Christian Hujer</a> - */ -public final class ActionFactory { - - /** The key used for storing a somewhat unique id for this Action. */ - @NotNull public static final String ACTION_ID = "ActionID"; - - /** The key used for storing an alternative accelerator for this Action. - * Currently unused. - */ - @NotNull public static final String ACCELERATOR_KEY_2 = "AcceleratorKey2"; - - /** The ActionFactories. */ - @NotNull private static final Map<String, ActionFactory> FACTORIES = new WeakHashMap<String, ActionFactory>(); - - /** The parent ActionFactories. */ - @NotNull private final List<ActionFactory> parents = new LinkedList<ActionFactory>(); - - /** The ResourceBundles to look for. - * Type: ResourceBundle - */ - @NotNull private final List<ResourceBundle> bundles = new LinkedList<ResourceBundle>(); - - /** The Preferences to look for. - * Type: Preferences - */ - @NotNull private final List<Preferences> prefs = new LinkedList<Preferences>(); - - /** The ActionMap to which created Actions are automatically added. */ - @NotNull private final ActionMap actionMap = new NamedActionMap(); - - private List<ActionProvider> actionProviders = new ArrayList<ActionProvider>(); - - /** Get an ActionFactory. - * If there is no ActionFactory with name <var>key</var>, a new ActionFactory is created and stored. - * Future invocations of this method will constantly return that ActionFactory unless the key is garbage collected. - * If you must prevent the key from being garbage collected (and with it the ActionFactory), you may internalize the key ({@link String#intern()}). - * A good name for a key is the application or package name. - * The <code><var>key</var></code> may be a package name, in which case it is tried to load a {@link ResourceBundle} named "action" from that - * package and add it ({@link #addBundle(ResourceBundle)}); nothing special happens if that fails. - * @param key name of ActionFactory (which even may be <code>null</code> if you are too lazy to invent a key) - * @return ActionFactory for given key. The factory is created in case it didn't already exist. - */ - @NotNull public static ActionFactory getFactory(@Nullable final String key) { - ActionFactory factory = FACTORIES.get(key); - if (factory == null) { - factory = new ActionFactory(); - FACTORIES.put(key, factory); - try { - factory.addBundle(key + ".action"); - } catch (final MissingResourceException e) { - /* ignore */ - } - // eventually initialize factory here - } - return factory; - } - - /** Add a ResourceBundle to the list of used bundles. - * @param baseName the base name of the resource bundle, a fully qualified class name - * @see ResourceBundle#getBundle(String) - */ - public void addBundle(@NotNull final String baseName) { - //noinspection ConstantConditions - if (baseName == null) { - throw new NullPointerException("null bundle name not allowed"); - } - @NotNull final ResourceBundle newBundle = getBundle(baseName); - addBundle(newBundle); - @Nullable final String additionalBundles = newBundle.getString("ActionFactory.additionalBundles"); - if (additionalBundles != null) { - for (final String additionalBundle : additionalBundles.split("\\s+")) { - addBundle(additionalBundle); - } - } - } - - /** Method to find the JMenuItem for a specific Action. - * @param menuBar JMenuBar to search - * @param action Action to find JMenuItem for - * @return JMenuItem for action or <code>null</code> if none found - * @throws NullPointerException if <var>action</var> or <var>menuBar</var> is <code>null</code> - */ - @Nullable public static JMenuItem find(@NotNull final JMenuBar menuBar, @NotNull final Action action) { - //noinspection ConstantConditions - if (menuBar == null) { - throw new NullPointerException("null JMenuBar not allowed"); - } - //noinspection ConstantConditions - if (action == null) { - throw new NullPointerException("null Action not allowed"); - } - for (int i = 0; i < menuBar.getMenuCount(); i++) { - final JMenu menu = menuBar.getMenu(i); - if (menu.getAction() == action) { - return menu; - } else { - final JMenuItem ret = find(menu, action); - if (ret != null) { - return ret; - } - } - } - return null; - } - - /** Method to find the JMenuItem for a specific Action. - * @param menu JMenu to search - * @param action Action to find JMenuItem for - * @return JMenuItem for action or <code>null</code> if none found - * @throws NullPointerException if <var>menu</var> or <var>action</var> is <code>null</code> - */ - @Nullable public static JMenuItem find(@NotNull final JMenu menu, @NotNull final Action action) { - for (int i = 0; i < menu.getItemCount(); i++) { - final JMenuItem item = menu.getItem(i); - if (item == null) { - // Ignore Separators - } else if (item.getAction() == action) { - return item; - } else if (item instanceof JMenu) { - final JMenuItem ret = find((JMenu) item, action); - if (ret != null) { - return ret; - } - } - } - return null; - } - - /** Create an ActionFactory. - * This constructor is private to force users to use the method {@link #getFactory(String)} for recycling ActionFactories and profit of easy - * access to the same ActionFactory from within the whole application without passing around ActionFactory references. - */ - private ActionFactory() { - } - - /** Get the ActionMap. - * @return ActionMap - */ - @NotNull public ActionMap getActionMap() { - return actionMap; - } - - /** Add a ResourceBundle to the list of used bundles. - * @param bundle ResourceBundle to add - * @throws NullPointerException if <code>bundle == null</code> - */ - public void addBundle(@NotNull final ResourceBundle bundle) throws NullPointerException { - //noinspection ConstantConditions - if (bundle == null) { - throw new NullPointerException("null ResourceBundle not allowed"); - } - if (!bundles.contains(bundle)) { - // insert first because new bundles override old bundles - bundles.add(0, bundle); - } - } - - /** Add a parent to the list of used parents. - * @param parent Parent to use if lookups failed in this ActionFactory - * WARNING: Adding a descendents as parents of ancestors or vice versa will result in endless recursion and thus stack overflow! - * @throws NullPointerException if <code>parent == null</code> - */ - public void addParent(@NotNull final ActionFactory parent) throws NullPointerException { - //noinspection ConstantConditions - if (parent == null) { - throw new NullPointerException("null ActionFactory not allowed"); - } - parents.add(parent); - } - - /** Add a Preferences to the list of used preferences. - * @param pref Preferences to add - * @throws NullPointerException if <code>pref == null</code> - */ - public void addPref(@NotNull final Preferences pref) throws NullPointerException { - //noinspection ConstantConditions - if (pref == null) { - throw new NullPointerException("null ResourceBundle not allowed"); - } - if (!prefs.contains(pref)) { - prefs.add(pref); - } - } - - /** Add a Preferences to the list of used preferences. - * @param clazz the class whose package a user preference node is desired - * @see Preferences#userNodeForPackage(Class) - * @throws NullPointerException if <code>clazz == null</code> - */ - public void addPref(@NotNull final Class<?> clazz) { - //noinspection ConstantConditions - if (clazz == null) { - throw new NullPointerException("null Class not allowed"); - } - addPref(userNodeForPackage(clazz)); - } - - /** Creates actions. - * This is a loop variant of {@link #createAction(boolean,String)}. - * The actions created can be retrieved using {@link #getAction(String)} or via the ActionMap returned by {@link #getActionMap()}. - * @param store whether to store the initialized Action in the ActionMap of this ActionFactory - * @param keys Keys of actions to create - * @return Array with created actions - * @throws NullPointerException in case keys is or contains <code>null</code> - */ - public Action[] createActions(final boolean store, @NotNull final String... keys) throws NullPointerException { - final Action[] actions = new Action[keys.length]; - for (int i = 0; i < keys.length; i++) { - actions[i] = createAction(store, keys[i]); - } - return actions; - } - - /** Create an Action. - * The created Action is automatically stored together with all other Actions created by this Factory instance in an ActionMap, which you can - * retreive using {@link #getActionMap()}. - * @param store whether to store the initialized Action in the ActionMap of this ActionFactory - * @param key Key for Action, which is used as basename for access to Preferences and ResourceBundles and as ActionMap key (may not be - * <code>null</code>) - * @return created Action, which is a dummy in the sense that its {@link Action#actionPerformed(ActionEvent)} method does not do anything - * @throws NullPointerException in case <var>key</var> was <code>null</code> - * @see #createAction(boolean,String,Object) - * @see #createToggle(boolean,String,Object) - * @see #initAction(boolean,Action,String) - */ - public Action createAction(final boolean store, @NotNull final String key) throws NullPointerException { - // initAction() checks for null key - return initAction(store, new DummyAction(), key); - } - - /** Initialize an Action. - * This is a convenience method for Action users which want to use the services provided by this {@link ActionFactory} class but need more - * sophisticated Action objects they created on their own. - * So you can simply create an Action and pass it to this Initialization method to fill its data. - * The initialized Action is automatically stored together with all other Actions created by this Factory instance in an ActionMap, which you can - * retreive using {@link #getActionMap()}. - * @param store whether to store the initialized Action in the ActionMap of this ActionFactory - * @param action Action to fill - * @param key Key for Action, which is used as basename for access to Preferences and ResourceBundles and as ActionMap key (may not be <code>null</code>) - * @return the supplied Action object (<var>action</var>) is returned for convenience - * @throws NullPointerException in case <var>key</var> was <code>null</code> - */ - @SuppressWarnings({"NestedAssignment"}) - public Action initAction(final boolean store, @NotNull final Action action, @NotNull final String key) throws NullPointerException { - if (key == null) { throw new NullPointerException("null key for Action initialization not allowed."); } - action.putValue(ACTION_ID, key); - String value; - if ((value = getString(key + ".text" )) != null) { action.putValue(NAME, value); } - if ((value = getString(key + ".shortdescription")) != null) { action.putValue(SHORT_DESCRIPTION, value); } - if ((value = getString(key + ".longdescription" )) != null) { action.putValue(LONG_DESCRIPTION, value); } - if ((value = getString(key + ".accel" )) != null) { action.putValue(ACCELERATOR_KEY, getKeyStroke(value)); } - if ((value = getString(key + ".accel2" )) != null) { action.putValue(ACCELERATOR_KEY_2, getKeyStroke(value)); } - if ((value = getString(key + ".mnemonic" )) != null) { action.putValue(MNEMONIC_KEY, getKeyStroke(value).getKeyCode()); } - if ((value = getString(key + ".icon" )) != null) { - final Icon image = getDefaultIconManager().getIcon(value); - if (image != null) { action.putValue(SMALL_ICON, image); } - } - action.putValue(REFLECTION_MESSAGE_PROVIDER, this); - if (store) { - actionMap.put(key, action); - } - return action; - } - - /** Get a String. - * First looks one pref after another, in their addition order. - * Then looks one bundle after another, in their addition order. - ... [truncated message content] |
From: <chr...@us...> - 2007-08-12 11:45:47
|
Revision: 572 http://japi.svn.sourceforge.net/japi/?rev=572&view=rev Author: christianhujer Date: 2007-08-12 04:45:43 -0700 (Sun, 12 Aug 2007) Log Message: ----------- Moved static factory method for ActionBuilder to new factory class ActionBuilderFactory. Modified Paths: -------------- historic/trunk/src/app/net/sf/japi/swing/JFileChooserButton.java historic/trunk/src/app/net/sf/japi/swing/JSAXErrorHandler.java historic/trunk/src/app/net/sf/japi/swing/LookAndFeelManager.java historic/trunk/src/app/net/sf/japi/swing/TipOfTheDayManager.java historic/trunk/src/app/net/sf/japi/swing/bookmarks/BookmarkManager.java historic/trunk/src/app/net/sf/japi/swing/font/FontChooser.java historic/trunk/src/app/net/sf/japi/swing/font/FontPreview.java historic/trunk/src/app/net/sf/japi/swing/font/FontStyleListCellRenderer.java historic/trunk/src/app/net/sf/japi/swing/prefs/PreferencesPane.java historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/PrefsExampleApp.java historic/trunk/src/doc/guide/swing/tod/src/ex/TodExampleApp.java libs/swing-about/trunk/src/net/sf/japi/swing/about/AboutDialog.java libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilder.java libs/swing-action/trunk/src/net/sf/japi/swing/ReflectionAction.java libs/swing-action/trunk/src/test/net/sf/japi/swing/ReflectionActionTest.java libs/swing-bookmarks/trunk/src/net/sf/japi/swing/bookmarks/BookmarkManager.java libs/swing-font/trunk/src/net/sf/japi/swing/font/FontChooser.java libs/swing-font/trunk/src/net/sf/japi/swing/font/FontPreview.java libs/swing-font/trunk/src/net/sf/japi/swing/font/FontStyleListCellRenderer.java libs/swing-keyprefs/trunk/src/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java libs/swing-keyprefs/trunk/src/net/sf/japi/swing/prefs/keys/KeyStrokePrefs.java libs/swing-keyprefs/trunk/src/net/sf/japi/swing/prefs/keys/KeyStrokeTreeTableModel.java libs/swing-list/trunk/src/net/sf/japi/swing/list/ListControlPanel.java libs/swing-misc/trunk/src/net/sf/japi/swing/misc/JFileChooserButton.java libs/swing-misc/trunk/src/net/sf/japi/swing/misc/JSAXErrorHandler.java libs/swing-prefs/trunk/src/net/sf/japi/swing/prefs/PreferencesPane.java libs/swing-tod/trunk/src/net/sf/japi/swing/tod/TipOfTheDayManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/AbstractManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/MenuManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/OpenURLPane.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/ToolBarManager.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/recent/RecentURLsMenu.java progs/jeduca/trunk/src/net/sf/japi/progs/jeduca/swing/settings/SettingsPane.java progs/jeduca/trunk/src/net/sf/japi/swing/LookAndFeelManager.java tools/fontbrowser/trunk/src/net/sf/japi/tools/fontbrowser/FontBrowser.java tools/keystrokes/trunk/src/net/sf/japi/tools/keystrokes/KeyStrokes.java tools/prefsbrowser/trunk/src/net/sf/japi/tools/prefsbrowser/PrefsBrowser.java tools/prefsbrowser/trunk/src/net/sf/japi/tools/prefsbrowser/PrefsTreeTableModel.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/CodecSelectionPanel.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/DoubleListController.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/ListOrderController.java tools/string2bytes/trunk/src/net/sf/japi/string2bytes/String2Bytes.java Added Paths: ----------- libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilderFactory.java Modified: historic/trunk/src/app/net/sf/japi/swing/JFileChooserButton.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/JFileChooserButton.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/app/net/sf/japi/swing/JFileChooserButton.java 2007-08-12 11:45:43 UTC (rev 572) @@ -33,7 +33,7 @@ public class JFileChooserButton extends JButton { /** Action Builder. */ - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.swing"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing"); /** The JTextField to read/write the file path to. * @serial include Modified: historic/trunk/src/app/net/sf/japi/swing/JSAXErrorHandler.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/JSAXErrorHandler.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/app/net/sf/japi/swing/JSAXErrorHandler.java 2007-08-12 11:45:43 UTC (rev 572) @@ -37,7 +37,7 @@ public final class JSAXErrorHandler extends JOptionPane implements ErrorHandler { /** Action Builder. */ - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.swing"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing"); /** The JTextArea which displays the errors. * @serial include Modified: historic/trunk/src/app/net/sf/japi/swing/LookAndFeelManager.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/LookAndFeelManager.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/app/net/sf/japi/swing/LookAndFeelManager.java 2007-08-12 11:45:43 UTC (rev 572) @@ -33,8 +33,8 @@ import javax.swing.JFrame; import javax.swing.JMenu; import javax.swing.JRadioButtonMenuItem; +import static javax.swing.SwingUtilities.updateComponentTreeUI; import javax.swing.UIManager; -import static javax.swing.SwingUtilities.updateComponentTreeUI; import static javax.swing.UIManager.getInstalledLookAndFeels; import static javax.swing.UIManager.getLookAndFeel; import static javax.swing.UIManager.installLookAndFeel; @@ -82,7 +82,7 @@ * @return menu with selectable look and feels */ public JMenu createMenu() { - return fillMenu(new JMenu(ActionBuilder.getActionBuilder("net.sf.japi.swing").createAction(true, "laf"))); + return fillMenu(new JMenu(ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing").createAction(true, "laf"))); } /** Fill a menu with look and feel selection items. Modified: historic/trunk/src/app/net/sf/japi/swing/TipOfTheDayManager.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/TipOfTheDayManager.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/app/net/sf/japi/swing/TipOfTheDayManager.java 2007-08-12 11:45:43 UTC (rev 572) @@ -23,6 +23,12 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.Font; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.List; import java.util.MissingResourceException; @@ -31,12 +37,6 @@ import static java.util.ResourceBundle.getBundle; import java.util.prefs.Preferences; import static java.util.prefs.Preferences.userNodeForPackage; -import java.io.InputStream; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.security.PrivilegedAction; -import java.security.AccessController; import javax.swing.Action; import static javax.swing.Action.ACCELERATOR_KEY; import javax.swing.JButton; @@ -48,9 +48,9 @@ import javax.swing.JScrollPane; import javax.swing.KeyStroke; import static javax.swing.SwingConstants.TRAILING; -import org.jetbrains.annotations.Nullable; import static net.sf.japi.swing.ActionBuilder.ACCELERATOR_KEY_2; import static net.sf.japi.swing.IconManager.getDefaultIconManager; +import org.jetbrains.annotations.Nullable; /** Class that manages tips of the day. * The tips of the day are read from a property file. @@ -80,7 +80,7 @@ public final class TipOfTheDayManager extends JOptionPane { /** Action Builder. */ - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.swing"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing"); /** Random number generator for random tods. */ private static final Random RND = new Random(); Modified: historic/trunk/src/app/net/sf/japi/swing/bookmarks/BookmarkManager.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/bookmarks/BookmarkManager.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/app/net/sf/japi/swing/bookmarks/BookmarkManager.java 2007-08-12 11:45:43 UTC (rev 572) @@ -49,6 +49,10 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; +import net.sf.japi.swing.IconManager; +import net.sf.japi.util.EmptyEnumeration; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -56,9 +60,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.ls.DOMImplementationLS; import org.xml.sax.SAXException; -import net.sf.japi.swing.ActionBuilder; -import net.sf.japi.swing.IconManager; -import net.sf.japi.util.EmptyEnumeration; /** Class for managing and displaying Bookmarks. * Usage of this class works the following way: @@ -78,7 +79,7 @@ private BookmarkFolder bookmarks = new BookmarkFolder(); /** Action Builder. */ - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.swing.bookmarks"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing.bookmarks"); /** The ProgramFrame this BookmarkManager manages bookmarks for. */ private Bookmarkable bookmarkable; Modified: historic/trunk/src/app/net/sf/japi/swing/font/FontChooser.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/font/FontChooser.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/app/net/sf/japi/swing/font/FontChooser.java 2007-08-12 11:45:43 UTC (rev 572) @@ -47,8 +47,9 @@ import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; +import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; import org.jetbrains.annotations.Nullable; -import net.sf.japi.swing.ActionBuilder; /** Class for letting the user choose a font. * There are two possibilities to use this class: @@ -61,7 +62,7 @@ public class FontChooser extends JComponent implements ListSelectionListener, ChangeListener { /** Action Builder. */ - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.swing.font"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing.font"); /** JList for Font Family. * @serial include Modified: historic/trunk/src/app/net/sf/japi/swing/font/FontPreview.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/font/FontPreview.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/app/net/sf/japi/swing/font/FontPreview.java 2007-08-12 11:45:43 UTC (rev 572) @@ -23,6 +23,7 @@ import java.awt.Dimension; import javax.swing.JTextField; import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; /** Font Preview. * Uses a localized text to display the font, but the user may edit the text to try out the characters she's interested in. @@ -35,7 +36,7 @@ private static final long serialVersionUID = 1L; /** Action Builder. */ - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.swing.font"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing.font"); /** Create a new FontPreview. */ public FontPreview() { Modified: historic/trunk/src/app/net/sf/japi/swing/font/FontStyleListCellRenderer.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/font/FontStyleListCellRenderer.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/app/net/sf/japi/swing/font/FontStyleListCellRenderer.java 2007-08-12 11:45:43 UTC (rev 572) @@ -28,6 +28,7 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.JList; import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; /** ListCellRenderer for font styles. * @author <a href="mailto:ch...@ri...">Christian Hujer</a> @@ -39,7 +40,7 @@ private static final long serialVersionUID = 1L; /** Action Builder. */ - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.swing.font"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing.font"); /** {@inheritDoc} */ @Override public Component getListCellRendererComponent(final JList list, final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) { Modified: historic/trunk/src/app/net/sf/japi/swing/prefs/PreferencesPane.java =================================================================== --- historic/trunk/src/app/net/sf/japi/swing/prefs/PreferencesPane.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/app/net/sf/japi/swing/prefs/PreferencesPane.java 2007-08-12 11:45:43 UTC (rev 572) @@ -41,6 +41,7 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; /** Panel to display preferences. * @serial exclude This class is not intended to be serialized. @@ -50,7 +51,7 @@ public final class PreferencesPane extends JOptionPane implements ListSelectionListener { /** Action Builder. */ - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.swing.prefs"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing.prefs"); /** A map for DIALOGS that are already displaying. * This map is used to prevent the dialog for the same PreferencesGroup be shown twice within the same application. Modified: historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java =================================================================== --- historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java 2007-08-12 11:45:43 UTC (rev 572) @@ -5,6 +5,7 @@ import java.awt.event.WindowEvent; import javax.swing.JFrame; import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; import net.sf.japi.swing.ActionMethod; /** Example application. */ @@ -21,7 +22,7 @@ new Application(); } - private ActionBuilder actionBuilder = ActionBuilder.getActionBuilder("ex"); + private ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("ex"); public Application() { frame = new JFrame(actionBuilder.getString("appWindow.title")); Modified: historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java =================================================================== --- historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2007-08-12 11:45:43 UTC (rev 572) @@ -6,8 +6,8 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; import javax.swing.Action; import javax.swing.JFileChooser; import static javax.swing.JFileChooser.APPROVE_OPTION; @@ -16,15 +16,16 @@ import javax.swing.JTextPane; import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; import javax.swing.text.DefaultEditorKit; -import org.jetbrains.annotations.Nullable; import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; import net.sf.japi.swing.ActionMethod; import net.sf.japi.swing.ActionProvider; +import org.jetbrains.annotations.Nullable; public class Editor implements ActionProvider { /** Action Builder. */ - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.examples.editor"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.examples.editor"); /** The supported editor action names and their corresponding kit action names. */ private static final Map<String, String> editorActionNames = new HashMap<String, String>(); Modified: historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/PrefsExampleApp.java =================================================================== --- historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/PrefsExampleApp.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/PrefsExampleApp.java 2007-08-12 11:45:43 UTC (rev 572) @@ -1,13 +1,14 @@ package ex; +import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; +import net.sf.japi.swing.prefs.PreferencesGroup; import static net.sf.japi.swing.prefs.PreferencesPane.showPreferencesDialog; import net.sf.japi.swing.prefs.keys.KeyStrokePrefs; -import net.sf.japi.swing.prefs.PreferencesGroup; -import net.sf.japi.swing.ActionBuilder; public class PrefsExampleApp { - private static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("ex"); + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("ex"); /** Main program. * @param args command line arguments Modified: historic/trunk/src/doc/guide/swing/tod/src/ex/TodExampleApp.java =================================================================== --- historic/trunk/src/doc/guide/swing/tod/src/ex/TodExampleApp.java 2007-08-12 09:02:36 UTC (rev 571) +++ historic/trunk/src/doc/guide/swing/tod/src/ex/TodExampleApp.java 2007-08-12 11:45:43 UTC (rev 572) @@ -1,9 +1,12 @@ package ex; + import javax.swing.JButton; import javax.swing.JFrame; import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; import net.sf.japi.swing.TipOfTheDayManager; + public class TodExampleApp { public static void main(final String... args) { //System.setProperty("net.sf.japi.swing.tod", "ex.tod"); @@ -11,7 +14,7 @@ } final JFrame frame; public TodExampleApp() { - final ActionBuilder actionBuilder = ActionBuilder.getActionBuilder("ex"); + final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("ex"); frame = new JFrame(actionBuilder.getString("frame.title")); frame.add(new JButton(actionBuilder.createAction(false, "showTod", this))); frame.pack(); Modified: libs/swing-about/trunk/src/net/sf/japi/swing/about/AboutDialog.java =================================================================== --- libs/swing-about/trunk/src/net/sf/japi/swing/about/AboutDialog.java 2007-08-12 09:02:36 UTC (rev 571) +++ libs/swing-about/trunk/src/net/sf/japi/swing/about/AboutDialog.java 2007-08-12 11:45:43 UTC (rev 572) @@ -42,6 +42,7 @@ import javax.swing.JTextArea; import javax.swing.SwingConstants; import net.sf.japi.swing.ActionBuilder; +import net.sf.japi.swing.ActionBuilderFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -100,7 +101,7 @@ public class AboutDialog extends JPanel { /** Action Builder to create Actions. */ - @NotNull protected static final ActionBuilder ACTION_BUILDER = ActionBuilder.getActionBuilder("net.sf.japi.swing.about"); + @NotNull protected static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing.about"); /** Default buffer size for I/O, e.g. when reading a license. */ private static final int BUF_SIZE = 4096; @@ -160,7 +161,7 @@ * @param actionBuilderName Name of the ActionBuilder to use. */ public AboutDialog(@NotNull final String actionBuilderName) { - this(ActionBuilder.getActionBuilder(actionBuilderName)); + this(ActionBuilderFactory.getInstance().getActionBuilder(actionBuilderName)); } /** Modified: libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilder.java =================================================================== --- libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilder.java 2007-08-12 09:02:36 UTC (rev 571) +++ libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilder.java 2007-08-12 11:45:43 UTC (rev 572) @@ -26,11 +26,9 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; import static java.util.ResourceBundle.getBundle; -import java.util.WeakHashMap; import java.util.prefs.Preferences; import static java.util.prefs.Preferences.userNodeForPackage; import javax.swing.AbstractAction; @@ -146,7 +144,7 @@ * most common way of using an ActionBuilder. * </li> * <li> - * If you think you're too lazy to hold your own ActionBuilder reference and instead more often call {@link #getActionBuilder(String)}, just go ahead + * If you think you're too lazy to hold your own ActionBuilder reference and instead more often call {@link ActionBuilderFactory#getActionBuilder(String)}, just go ahead * and do so. * Looking up created ActionBuilders is extremely fast, and of course they are initialized exactly once, not more. * </li> @@ -172,9 +170,6 @@ */ @NotNull public static final String ACCELERATOR_KEY_2 = "AcceleratorKey2"; - /** The ActionBuilders. */ - @NotNull private static final Map<String, ActionBuilder> BUILDERS = new WeakHashMap<String, ActionBuilder>(); - /** The parent ActionBuilders. */ @NotNull private final List<ActionBuilder> parents = new LinkedList<ActionBuilder>(); @@ -194,25 +189,6 @@ /** The action providers that were registered and will be queried when an action should be created / retrieved. */ private List<ActionProvider> actionProviders = new ArrayList<ActionProvider>(); - /** Get an ActionBuilder. - * If there is no ActionBuilder with name <var>key</var>, a new ActionBuilder is created and stored. - * Future invocations of this method will constantly return that ActionBuilder unless the key is garbage collected. - * If you must prevent the key from being garbage collected (and with it the ActionBuilder), you may internalize the key ({@link String#intern()}). - * A good name for a key is the application or package name. - * The <code><var>key</var></code> may be a package name, in which case it is tried to load a {@link ResourceBundle} named "action" from that - * package and add it ({@link #addBundle(ResourceBundle)}); nothing special happens if that fails. - * @param key name of ActionBuilder (which even may be <code>null</code> if you are too lazy to invent a key) - * @return ActionBuilder for given key. The builder is created in case it didn't already exist. - */ - @NotNull public static ActionBuilder getActionBuilder(@Nullable final String key) { - ActionBuilder builder = BUILDERS.get(key); - if (builder == null) { - builder = new ActionBuilder(key); - BUILDERS.put(key, builder); - } - return builder; - } - /** Add a ResourceBundle to the list of used bundles. * @param baseName the base name of the resource bundle, a fully qualified class name * @see ResourceBundle#getBundle(String) @@ -294,7 +270,7 @@ /** * Create an ActionBuilder. - * Usually you wouldn't create an ActionBuilder yourself but use {@link #getActionBuilder(String)} for recycling ActionBuilders and profit of easy + * Usually you wouldn't create an ActionBuilder yourself but use {@link ActionBuilderFactory#getActionBuilder(String)} for recycling ActionBuilders and profit of easy * access to the same ActionBuilder from within the whole application without passing around ActionBuilder references. * Don't use this constructor without knowing what you're doing. * It's mainly there for testing purposes. @@ -304,7 +280,7 @@ /** * Create an ActionBuilder. - * Usually you wouldn't create an ActionBuilder yourself but use {@link #getActionBuilder(String)} for recycling ActionBuilders and profit of easy + * Usually you wouldn't create an ActionBuilder yourself but use {@link ActionBuilderFactory#getActionBuilder(String)} for recycling ActionBuilders and profit of easy * access to the same ActionBuilder from within the whole application without passing around ActionBuilder references. * Use this constructor if you explicitely need a new ActionBuilder that doesn't share information (especially the action cache) with other ActionBuilder instances. * @param key name of ActionBuilder. Added: libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilderFactory.java =================================================================== --- libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilderFactory.java (rev 0) +++ libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilderFactory.java 2007-08-12 11:45:43 UTC (rev 572) @@ -0,0 +1,61 @@ +/* + * JAPI libs-swing-action is a library for creating and managing javax.swing.Action objects. + * 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; + +import java.util.Map; +import java.util.ResourceBundle; +import java.util.WeakHashMap; +import org.jetbrains.annotations.NotNull; + +/** An ActionBuilderFactory provides implementations of {@link ActionBuilder}. + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> + */ +public class ActionBuilderFactory { + + /** The ActionBuilders. */ + @NotNull public final Map<String, ActionBuilder> actionBuilders = new WeakHashMap<String, ActionBuilder>(); + + /** Create an ActionBuilderFactory. + * @return An ActionBuilderFactory. + */ + public static ActionBuilderFactory getInstance() { + return new ActionBuilderFactory(); + } + + /** Get an ActionBuilder. + * If there is no ActionBuilder with name <var>key</var>, a new ActionBuilder is created and stored. + * Future invocations of this method will constantly return that ActionBuilder unless the key is garbage collected. + * If you must prevent the key from being garbage collected (and with it the ActionBuilder), you may internalize the key ({@link String#intern()}). + * A good name for a key is the application or package name. + * The <code><var>key</var></code> may be a package name, in which case it is tried to load a {@link ResourceBundle} named "action" from that + * package and add it ({@link ActionBuilder#addBundle(ResourceBundle)}); nothing special happens if that fails. + * @param baseName Name of ActionBuilder (which even may be <code>null</code> if you are too lazy to invent a key) + * @return ActionBuilder for given key. The builder is created in case it didn't already exist. + */ + @NotNull public ActionBuilder getActionBuilder(final String baseName) { + ActionBuilder builder = actionBuilders.get(baseName); + if (builder == null) { + builder = new ActionBuilder(baseName); + actionBuilders.put(baseName, builder); + } + return builder; + } + +} // class ActionBuilderFactory Property changes on: libs/swing-action/trunk/src/net/sf/japi/swing/ActionBuilderFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + LF Modified: libs/swing-action/trunk/src/net/sf/japi/swing/ReflectionAction.java =================================================================== --- libs/swing-action/trunk/src/net/sf... [truncated message content] |
From: <chr...@us...> - 2007-08-18 20:05:39
|
Revision: 584 http://japi.svn.sourceforge.net/japi/?rev=584&view=rev Author: christianhujer Date: 2007-08-18 13:05:33 -0700 (Sat, 18 Aug 2007) Log Message: ----------- Updated module and project files for IntelliJ IDEA 7.0M2. Modified Paths: -------------- common/trunk/common.iml historic/trunk/historic.iml japi.ipr libs/argparser/trunk/libs-argparser.iml libs/finance/trunk/libs-finance.iml libs/io/trunk/libs-io.iml libs/lang/trunk/libs-lang.iml libs/logging/trunk/libs-logging.iml libs/net/trunk/libs-net.iml libs/registry/trunk/libs-registry.iml libs/swing-about/trunk/libs-swing-about.iml libs/swing-action/trunk/libs-swing-action.iml libs/swing-app/trunk/libs-swing-app.iml libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml libs/swing-extlib/trunk/libs-swing-extlib.iml libs/swing-font/trunk/libs-swing-font.iml libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml libs/swing-list/trunk/libs-swing-list.iml libs/swing-misc/trunk/libs-swing-misc.iml libs/swing-prefs/trunk/libs-swing-prefs.iml libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml libs/swing-recent/trunk/libs-swing-recent.iml libs/swing-tod/trunk/libs-swing-tod.iml libs/swing-treetable/trunk/libs-swing-treetable.iml libs/taglets/trunk/libs-taglets.iml libs/util/trunk/libs-util.iml libs/xml/trunk/libs-xml.iml progs/jeduca/trunk/JEduca.iml site/trunk/site.iml tools/cstyle/trunk/cstyle.iml tools/findLongestPath/trunk/findLongestPath.iml tools/fontbrowser/trunk/fontbrowser.iml tools/jwget/trunk/jwget.iml tools/keystrokes/trunk/keystrokes.iml tools/prefsbrowser/trunk/prefsbrowser.iml tools/string2bytes/trunk/string2bytes.iml Modified: common/trunk/common.iml =================================================================== --- common/trunk/common.iml 2007-08-17 19:26:01 UTC (rev 583) +++ common/trunk/common.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: historic/trunk/historic.iml =================================================================== --- historic/trunk/historic.iml 2007-08-17 19:26:01 UTC (rev 583) +++ historic/trunk/historic.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: japi.ipr =================================================================== --- japi.ipr 2007-08-17 19:26:01 UTC (rev 583) +++ japi.ipr 2007-08-18 20:05:33 UTC (rev 584) @@ -6,7 +6,6 @@ <component name="BuildJarProjectSettings"> <option name="BUILD_JARS_ON_MAKE" value="false" /> </component> - <component name="ClearCase" /> <component name="CodeStyleProjectProfileManger"> <option name="PROJECT_PROFILE" /> <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> @@ -98,11 +97,12 @@ </wildcardResourcePatterns> </component> <component name="CppTools.Loader" warnedAboutFileOutOfSourceRoot="true" /> - <component name="DataSourceManagerImpl" /> <component name="DependenciesAnalyzeManager"> <option name="myForwardDirection" value="false" /> </component> - <component name="DependencyValidationManager" /> + <component name="DependencyValidationManager"> + <option name="SKIP_IMPORT_STATEMENTS" value="false" /> + </component> <component name="EclipseCompilerSettings"> <option name="DEBUGGING_INFO" value="true" /> <option name="GENERATE_NO_WARNINGS" value="true" /> @@ -125,7 +125,6 @@ <option name="OPEN_IN_BROWSER" value="false" /> <option name="OUTPUT_DIRECTORY" /> </component> - <component name="GUI Designer component loader factory" /> <component name="IdProvider" IDEtalkID="5E780004B4DFE6EEB324A7B925C9624D" /> <component name="InspectionProjectProfileManager"> <option name="PROJECT_PROFILE" value="Project Default" /> @@ -135,24 +134,6 @@ <profile version="1.0" is_locked="false"> <option name="myName" value="Project Default" /> <option name="myLocal" value="false" /> - <used_levels> - <error> - <option name="myName" value="ERROR" /> - <option name="myVal" value="400" /> - </error> - <warning> - <option name="myName" value="WARNING" /> - <option name="myVal" value="300" /> - </warning> - <information> - <option name="myName" value="INFO" /> - <option name="myVal" value="200" /> - </information> - <server> - <option name="myName" value="SERVER PROBLEM" /> - <option name="myVal" value="100" /> - </server> - </used_levels> <inspection_tool class="JavaDoc" level="WARNING" enabled="true"> <option name="TOP_LEVEL_CLASS_OPTIONS"> <value> @@ -244,6 +225,12 @@ <inspection_tool class="UnnecessaryQualifierForThis" level="WARNING" enabled="true" /> </profile> </profiles> + <list size="4"> + <item index="0" class="java.lang.String" itemvalue="SERVER PROBLEM" /> + <item index="1" class="java.lang.String" itemvalue="INFO" /> + <item index="2" class="java.lang.String" itemvalue="WARNING" /> + <item index="3" class="java.lang.String" itemvalue="ERROR" /> + </list> </component> <component name="InspectorGeneralConfiguration"> <option name="MAKE_CLASSES_AND_METHODS_FINAL_IF_NOT_OVERRIDDEN" value="false" /> @@ -301,7 +288,6 @@ <option name="FILTER_INFO" value="true" /> <option name="CUSTOM_FILTER" /> </component> - <component name="Monitor.Log4jWindowPlugin" /> <component name="Palette2"> <group name="Swing"> <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> @@ -423,6 +409,7 @@ </item> </group> </component> + <component name="ProjectFileVersion" converted="true" /> <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/progs/jeduca/trunk/JEduca.iml" filepath="$PROJECT_DIR$/progs/jeduca/trunk/JEduca.iml" group="progs" /> @@ -465,7 +452,6 @@ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/classes" /> </component> - <component name="ProjectRunConfigurationManager" /> <component name="ResourceManagerContainer"> <option name="myResourceBundles"> <value> @@ -480,12 +466,9 @@ <option name="GENERATE_IIOP_STUBS" value="false" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> - <component name="StarteamVcsAdapter" /> - <component name="SvnBranchConfigurationManager" /> <component name="VcsDirectoryMappings"> <mapping directory="" vcs="svn" /> </component> - <component name="VssVcs" /> <component name="com.intellij.jsf.UserDefinedFacesConfigs"> <option name="USER_DEFINED_CONFIGS"> <value> @@ -715,6 +698,5 @@ <SOURCES /> </library> </component> - <component name="uidesigner-configuration" /> </project> Modified: libs/argparser/trunk/libs-argparser.iml =================================================================== --- libs/argparser/trunk/libs-argparser.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/argparser/trunk/libs-argparser.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/finance/trunk/libs-finance.iml =================================================================== --- libs/finance/trunk/libs-finance.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/finance/trunk/libs-finance.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/io/trunk/libs-io.iml =================================================================== --- libs/io/trunk/libs-io.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/io/trunk/libs-io.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/lang/trunk/libs-lang.iml =================================================================== --- libs/lang/trunk/libs-lang.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/lang/trunk/libs-lang.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/logging/trunk/libs-logging.iml =================================================================== --- libs/logging/trunk/libs-logging.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/logging/trunk/libs-logging.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/net/trunk/libs-net.iml =================================================================== --- libs/net/trunk/libs-net.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/net/trunk/libs-net.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/registry/trunk/libs-registry.iml =================================================================== --- libs/registry/trunk/libs-registry.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/registry/trunk/libs-registry.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-about/trunk/libs-swing-about.iml =================================================================== --- libs/swing-about/trunk/libs-swing-about.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-about/trunk/libs-swing-about.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-action/trunk/libs-swing-action.iml =================================================================== --- libs/swing-action/trunk/libs-swing-action.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-action/trunk/libs-swing-action.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-app/trunk/libs-swing-app.iml =================================================================== --- libs/swing-app/trunk/libs-swing-app.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-app/trunk/libs-swing-app.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml =================================================================== --- libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-extlib/trunk/libs-swing-extlib.iml =================================================================== --- libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-font/trunk/libs-swing-font.iml =================================================================== --- libs/swing-font/trunk/libs-swing-font.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-font/trunk/libs-swing-font.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml =================================================================== --- libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-list/trunk/libs-swing-list.iml =================================================================== --- libs/swing-list/trunk/libs-swing-list.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-list/trunk/libs-swing-list.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-misc/trunk/libs-swing-misc.iml =================================================================== --- libs/swing-misc/trunk/libs-swing-misc.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-misc/trunk/libs-swing-misc.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-prefs/trunk/libs-swing-prefs.iml =================================================================== --- libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml =================================================================== --- libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-recent/trunk/libs-swing-recent.iml =================================================================== --- libs/swing-recent/trunk/libs-swing-recent.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-recent/trunk/libs-swing-recent.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-tod/trunk/libs-swing-tod.iml =================================================================== --- libs/swing-tod/trunk/libs-swing-tod.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-tod/trunk/libs-swing-tod.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/swing-treetable/trunk/libs-swing-treetable.iml =================================================================== --- libs/swing-treetable/trunk/libs-swing-treetable.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/swing-treetable/trunk/libs-swing-treetable.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/taglets/trunk/libs-taglets.iml =================================================================== --- libs/taglets/trunk/libs-taglets.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/taglets/trunk/libs-taglets.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/util/trunk/libs-util.iml =================================================================== --- libs/util/trunk/libs-util.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/util/trunk/libs-util.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: libs/xml/trunk/libs-xml.iml =================================================================== --- libs/xml/trunk/libs-xml.iml 2007-08-17 19:26:01 UTC (rev 583) +++ libs/xml/trunk/libs-xml.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: progs/jeduca/trunk/JEduca.iml =================================================================== --- progs/jeduca/trunk/JEduca.iml 2007-08-17 19:26:01 UTC (rev 583) +++ progs/jeduca/trunk/JEduca.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -43,6 +43,27 @@ <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> Modified: site/trunk/site.iml =================================================================== --- site/trunk/site.iml 2007-08-17 19:26:01 UTC (rev 583) +++ site/trunk/site.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: tools/cstyle/trunk/cstyle.iml =================================================================== --- tools/cstyle/trunk/cstyle.iml 2007-08-17 19:26:01 UTC (rev 583) +++ tools/cstyle/trunk/cstyle.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: tools/findLongestPath/trunk/findLongestPath.iml =================================================================== --- tools/findLongestPath/trunk/findLongestPath.iml 2007-08-17 19:26:01 UTC (rev 583) +++ tools/findLongestPath/trunk/findLongestPath.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: tools/fontbrowser/trunk/fontbrowser.iml =================================================================== --- tools/fontbrowser/trunk/fontbrowser.iml 2007-08-17 19:26:01 UTC (rev 583) +++ tools/fontbrowser/trunk/fontbrowser.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: tools/jwget/trunk/jwget.iml =================================================================== --- tools/jwget/trunk/jwget.iml 2007-08-17 19:26:01 UTC (rev 583) +++ tools/jwget/trunk/jwget.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: tools/keystrokes/trunk/keystrokes.iml =================================================================== --- tools/keystrokes/trunk/keystrokes.iml 2007-08-17 19:26:01 UTC (rev 583) +++ tools/keystrokes/trunk/keystrokes.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: tools/prefsbrowser/trunk/prefsbrowser.iml =================================================================== --- tools/prefsbrowser/trunk/prefsbrowser.iml 2007-08-17 19:26:01 UTC (rev 583) +++ tools/prefsbrowser/trunk/prefsbrowser.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> Modified: tools/string2bytes/trunk/string2bytes.iml =================================================================== --- tools/string2bytes/trunk/string2bytes.iml 2007-08-17 19:26:01 UTC (rev 583) +++ tools/string2bytes/trunk/string2bytes.iml 2007-08-18 20:05:33 UTC (rev 584) @@ -1,6 +1,5 @@ <?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$"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2007-09-23 21:19:09
|
Revision: 615 http://japi.svn.sourceforge.net/japi/?rev=615&view=rev Author: christianhujer Date: 2007-09-23 14:19:05 -0700 (Sun, 23 Sep 2007) Log Message: ----------- Changing src layout to make project directory layout compatible with NetBeans. Modified Paths: -------------- common/trunk/commonBuild.xml japi.ipr libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java Added Paths: ----------- libs/argparser/trunk/src/prj/ libs/argparser/trunk/src/prj/net/ libs/argparser/trunk/src/tst/ libs/argparser/trunk/src/tst/test/ libs/io/trunk/src/prj/ libs/io/trunk/src/prj/net/ libs/lang/trunk/src/prj/ libs/lang/trunk/src/prj/net/ libs/lang/trunk/src/tst/ libs/lang/trunk/src/tst/test/ libs/logging/trunk/src/prj/ libs/logging/trunk/src/prj/net/ libs/net/trunk/src/prj/ libs/net/trunk/src/prj/net/ libs/registry/trunk/src/prj/ libs/registry/trunk/src/prj/net/ libs/swing-about/trunk/src/prj/ libs/swing-about/trunk/src/prj/net/ libs/swing-action/trunk/src/prj/ libs/swing-action/trunk/src/prj/net/ libs/swing-action/trunk/src/tst/ libs/swing-action/trunk/src/tst/test/ libs/swing-app/trunk/src/prj/ libs/swing-app/trunk/src/prj/net/ libs/swing-bookmarks/trunk/src/prj/ libs/swing-bookmarks/trunk/src/prj/net/ libs/swing-extlib/trunk/src/prj/ libs/swing-extlib/trunk/src/prj/net/ libs/swing-extlib/trunk/src/tst/ libs/swing-extlib/trunk/src/tst/test/ libs/swing-font/trunk/src/prj/ libs/swing-font/trunk/src/prj/net/ libs/swing-keyprefs/trunk/src/prj/ libs/swing-keyprefs/trunk/src/prj/net/ libs/swing-list/trunk/src/prj/ libs/swing-list/trunk/src/prj/net/ libs/swing-list/trunk/src/tst/ libs/swing-list/trunk/src/tst/test/ libs/swing-misc/trunk/src/prj/ libs/swing-misc/trunk/src/prj/net/ libs/swing-prefs/trunk/src/prj/ libs/swing-prefs/trunk/src/prj/net/ libs/swing-prefs/trunk/src/tst/ libs/swing-prefs/trunk/src/tst/test/ libs/swing-proxyprefs/trunk/src/prj/ libs/swing-proxyprefs/trunk/src/prj/net/ libs/swing-tod/trunk/src/prj/ libs/swing-tod/trunk/src/prj/net/ libs/swing-treetable/trunk/src/prj/ libs/swing-treetable/trunk/src/prj/net/ libs/taglets/trunk/src/prj/ libs/taglets/trunk/src/prj/net/ libs/util/trunk/src/prj/ libs/util/trunk/src/prj/net/ libs/util/trunk/src/tst/ libs/util/trunk/src/tst/test/ libs/xml/trunk/src/prj/ libs/xml/trunk/src/prj/net/ progs/jeduca/trunk/src/prj/ progs/jeduca/trunk/src/prj/net/ progs/jeduca/trunk/src/prj/overview.html tools/cstyle/trunk/src/prj/ tools/cstyle/trunk/src/prj/net/ tools/cstyle/trunk/src/tst/ tools/cstyle/trunk/src/tst/test/ tools/findLongestPath/trunk/src/prj/ tools/findLongestPath/trunk/src/prj/net/ tools/fontbrowser/trunk/src/prj/ tools/fontbrowser/trunk/src/prj/net/ tools/jwget/trunk/src/prj/ tools/jwget/trunk/src/prj/net/ tools/keystrokes/trunk/src/prj/ tools/keystrokes/trunk/src/prj/net/ tools/prefsbrowser/trunk/src/prj/ tools/prefsbrowser/trunk/src/prj/net/ tools/string2bytes/trunk/src/prj/ tools/string2bytes/trunk/src/prj/net/ tools/string2bytes/trunk/src/tst/ tools/string2bytes/trunk/src/tst/test/ Removed Paths: ------------- libs/argparser/trunk/src/net/ libs/argparser/trunk/src/test/ libs/io/trunk/src/net/ libs/lang/trunk/src/net/ libs/lang/trunk/src/test/ libs/logging/trunk/src/net/ libs/net/trunk/src/net/ libs/registry/trunk/src/net/ libs/swing-about/trunk/src/net/ libs/swing-action/trunk/src/net/ libs/swing-action/trunk/src/test/ libs/swing-app/trunk/src/net/ libs/swing-bookmarks/trunk/src/net/ libs/swing-extlib/trunk/src/net/ libs/swing-extlib/trunk/src/test/ libs/swing-font/trunk/src/net/ libs/swing-keyprefs/trunk/src/net/ libs/swing-list/trunk/src/net/ libs/swing-list/trunk/src/test/ libs/swing-misc/trunk/src/net/ libs/swing-prefs/trunk/src/net/ libs/swing-prefs/trunk/src/test/ libs/swing-proxyprefs/trunk/src/net/ libs/swing-tod/trunk/src/net/ libs/swing-treetable/trunk/src/net/ libs/taglets/trunk/src/net/ libs/util/trunk/src/net/ libs/util/trunk/src/test/ libs/xml/trunk/src/net/ progs/jeduca/trunk/src/net/ progs/jeduca/trunk/src/overview.html tools/cstyle/trunk/src/net/ tools/cstyle/trunk/src/test/ tools/findLongestPath/trunk/src/net/ tools/fontbrowser/trunk/src/net/ tools/jwget/trunk/src/net/ tools/keystrokes/trunk/src/net/ tools/prefsbrowser/trunk/src/net/ tools/string2bytes/trunk/src/net/ tools/string2bytes/trunk/src/test/ Modified: common/trunk/commonBuild.xml =================================================================== --- common/trunk/commonBuild.xml 2007-09-23 20:21:52 UTC (rev 614) +++ common/trunk/commonBuild.xml 2007-09-23 21:19:05 UTC (rev 615) @@ -3,6 +3,23 @@ <!-- ~ Common build.xml for use in multiple projects. ~ + ~ The source structure of a project must be like this: + ~ * src/prj - the production source + ~ supported files: + ~ - **/*.java (compiled) + ~ - **/*.properties (copied) + ~ - META-INF/services/** (copied) + ~ * src/tst - the unit test source + ~ supported files: + ~ - **/*.java (compiled) + ~ - **/*.properties (copied) + ~ * src/doc - the documentation source (not for javadoc, but for hypertext documentation, e.g. examples) + ~ currently ignored except in checkstyle + ~ + ~ The destination structure of a project (generated files) will be: + ~ * dist/** - contains distribution archives + ~ * classes/** - contains compiled classes + ~ ~ Note: ~ Taskdefs and targets are sorted alphabetically. ~ Properties are also sorted alphabetically unless they depend on each other. @@ -72,7 +89,9 @@ <checkstyle config="${commonPath}/sun_checks.xml" > - <fileset dir="src" includes="**/*.java,**/*.properties" /> + <fileset dir="src/doc" includes="**/*.java,**/*.properties" /> + <fileset dir="src/prj" includes="**/*.java,**/*.properties" /> + <fileset dir="src/tst" includes="**/*.java,**/*.properties" /> </checkstyle> </target> @@ -96,15 +115,13 @@ debug="yes" > <classpath refid="class.path" /> - <exclude name="test/**/*.java" /> - <exclude name="doc/**/*.java" /> <exclude name="**/package-info.java" /> </javac> <copy todir="classes/production/${module.shortname}" > - <fileset dir="src" includes="net/**/*.properties" /> - <fileset dir="src" includes="META-INF/services/**" /> + <fileset dir="src/prj" includes="net/**/*.properties" /> + <fileset dir="src/prj" includes="META-INF/services/**" /> </copy> </target> @@ -229,12 +246,9 @@ <!--pathelement path="src" /--><!-- This is handled via packageset. --> </sourcepath> <packageset - dir="src" + dir="src/prj" defaultexcludes="yes" - > - <include name="net/**" /> - <exclude name="test/net/**" /> - </packageset> + /> <taglet name="net.sf.japi.taglets.FixmeTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" /> <taglet name="net.sf.japi.taglets.HistoryTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" /> <taglet name="net.sf.japi.taglets.InvariantTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" /> @@ -280,13 +294,10 @@ <classpath refid="class.path" /> <sourcepath> <pathelement path="${user.javadoc.javasrc}" /> - <pathelement path="src" /> </sourcepath> - <packageset - dir="src" - defaultexcludes="yes" - > - </packageset> + <packageset dir="src/doc" defaultexcludes="yes" /> + <packageset dir="src/prj" defaultexcludes="yes" /> + <packageset dir="src/tst" defaultexcludes="yes" /> <taglet name="net.sf.japi.taglets.FixmeTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" /> <taglet name="net.sf.japi.taglets.HistoryTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" /> <taglet name="net.sf.japi.taglets.InvariantTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" /> @@ -306,7 +317,7 @@ <mkdir dir="classes/test/${module.shortname}" /> <mkdir dir="docs/test" /> <javac - srcdir="src" + srcdir="src/tst" destdir="classes/test/${module.shortname}" encoding="utf-8" source="${javaversion}" @@ -315,13 +326,12 @@ > <classpath refid="class.path" /> <classpath location="classes/production/${module.shortname}" /> - <include name="test/**/*.java" /> <exclude name="**/package-info.java" /> </javac> <copy todir="classes/test/${module.shortname}" > - <fileset dir="src" includes="test/**/*.properties" /> + <fileset dir="src/tst" includes="test/**/*.properties" /> </copy> <junit printsummary="yes" haltonfailure="yes"> <classpath refid="class.path" /> @@ -330,7 +340,7 @@ <formatter type="plain" /> <formatter type="xml" /> <batchtest todir="docs/test"> - <fileset dir="src"> + <fileset dir="src/tst"> <include name="test/**/*Test.java" /> <exclude name="test/**/Abstract*Test.java" /> </fileset> Modified: japi.ipr =================================================================== --- japi.ipr 2007-09-23 20:21:52 UTC (rev 614) +++ japi.ipr 2007-09-23 21:19:05 UTC (rev 615) @@ -60,8 +60,6 @@ <option name="JD_KEEP_EMPTY_RETURN" value="false" /> <option name="HTML_ELEMENTS_TO_INSERT_NEW_LINE_BEFORE" value="" /> <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" /> - <option name="METHOD_ANNOTATION_WRAP" value="1" /> - <option name="FIELD_ANNOTATION_WRAP" value="1" /> <option name="ENUM_CONSTANTS_WRAP" value="2" /> <ADDITIONAL_INDENT_OPTIONS fileType="js"> <option name="INDENT_SIZE" value="4" /> @@ -223,6 +221,7 @@ <inspection_tool class="UnnecessaryEnumModifier" level="WARNING" enabled="true" /> <inspection_tool class="UnnecessaryInterfaceModifier" level="WARNING" enabled="true" /> <inspection_tool class="UnnecessaryQualifierForThis" level="WARNING" enabled="true" /> + <inspection_tool class="FallthruInSwitchStatement" level="WARNING" enabled="true" /> </profile> </profiles> <list size="4"> @@ -445,6 +444,7 @@ <module fileurl="file://$PROJECT_DIR$/libs/util/trunk/libs-util.iml" filepath="$PROJECT_DIR$/libs/util/trunk/libs-util.iml" group="libs" /> <module fileurl="file://$PROJECT_DIR$/libs/xml/trunk/libs-xml.iml" filepath="$PROJECT_DIR$/libs/xml/trunk/libs-xml.iml" group="libs" /> <module fileurl="file://$PROJECT_DIR$/tools/prefsbrowser/trunk/prefsbrowser.iml" filepath="$PROJECT_DIR$/tools/prefsbrowser/trunk/prefsbrowser.iml" group="tools" /> + <module fileurl="file://$PROJECT_DIR$/progs/requisitor/trunk/requisitor.iml" filepath="$PROJECT_DIR$/progs/requisitor/trunk/requisitor.iml" group="progs" /> <module fileurl="file://$PROJECT_DIR$/site/trunk/site.iml" filepath="$PROJECT_DIR$/site/trunk/site.iml" /> <module fileurl="file://$PROJECT_DIR$/tools/string2bytes/trunk/string2bytes.iml" filepath="$PROJECT_DIR$/tools/string2bytes/trunk/string2bytes.iml" group="tools" /> </modules> Copied: libs/argparser/trunk/src/prj/net (from rev 614, libs/argparser/trunk/src/net) Copied: libs/argparser/trunk/src/tst/test (from rev 614, libs/argparser/trunk/src/test) Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java =================================================================== --- libs/argparser/trunk/src/test/net/sf/japi/io/args/ArgParserTest.java 2007-09-23 20:21:52 UTC (rev 614) +++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java 2007-09-23 21:19:05 UTC (rev 615) @@ -264,7 +264,7 @@ @Test public void testOptionsFromFileSingleLine() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException { final MockCommand command = new MockCommand(); - ArgParser.parseAndRun(command, "@src/test/net/sf/japi/io/args/ArgParserTest_OptionsFileSingleLine"); + ArgParser.parseAndRun(command, "@src/tst/test/net/sf/japi/io/args/ArgParserTest_OptionsFileSingleLine"); final List<String> args = command.getArgs(); Assert.assertEquals("Option value must be stored.", "fooInput", command.getInput()); Assert.assertTrue("Run must be called even with zero arguments.", command.isRunCalled()); @@ -285,7 +285,7 @@ @Test public void testOptionsFromFileMultiple() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException { final MockCommand command = new MockCommand(); - ArgParser.parseAndRun(command, "@src/test/net/sf/japi/io/args/ArgParserTest_MultipleOptionsFileMaster"); + ArgParser.parseAndRun(command, "@src/tst/test/net/sf/japi/io/args/ArgParserTest_MultipleOptionsFileMaster"); final List<String> args = command.getArgs(); Assert.assertEquals("Option value must be stored.", "fooInput", command.getInput()); Assert.assertTrue("Run must be called even with zero arguments.", command.isRunCalled()); @@ -301,7 +301,7 @@ * @throws UnknownOptionException (unexpected) * @throws MissingArgumentException (unexpected) * @throws ArgumentFileNotFoundException (unexpected) - * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a> + * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a> */ @Test public void testSingleDashOption() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException { @@ -319,7 +319,7 @@ * @throws UnknownOptionException (unexpected) * @throws MissingArgumentException (unexpected) * @throws ArgumentFileNotFoundException (unexpected) - * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a> + * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a> */ @Test public void testSingleDashOptionWithEquals() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException { Copied: libs/io/trunk/src/prj/net (from rev 614, libs/io/trunk/src/net) Copied: libs/lang/trunk/src/prj/net (from rev 614, libs/lang/trunk/src/net) Copied: libs/lang/trunk/src/tst/test (from rev 614, libs/lang/trunk/src/test) Copied: libs/logging/trunk/src/prj/net (from rev 614, libs/logging/trunk/src/net) Copied: libs/net/trunk/src/prj/net (from rev 614, libs/net/trunk/src/net) Copied: libs/registry/trunk/src/prj/net (from rev 614, libs/registry/trunk/src/net) Copied: libs/swing-about/trunk/src/prj/net (from rev 614, libs/swing-about/trunk/src/net) Copied: libs/swing-action/trunk/src/prj/net (from rev 614, libs/swing-action/trunk/src/net) Copied: libs/swing-action/trunk/src/tst/test (from rev 614, libs/swing-action/trunk/src/test) Copied: libs/swing-app/trunk/src/prj/net (from rev 614, libs/swing-app/trunk/src/net) Copied: libs/swing-bookmarks/trunk/src/prj/net (from rev 614, libs/swing-bookmarks/trunk/src/net) Copied: libs/swing-extlib/trunk/src/prj/net (from rev 614, libs/swing-extlib/trunk/src/net) Copied: libs/swing-extlib/trunk/src/tst/test (from rev 614, libs/swing-extlib/trunk/src/test) Copied: libs/swing-font/trunk/src/prj/net (from rev 614, libs/swing-font/trunk/src/net) Copied: libs/swing-keyprefs/trunk/src/prj/net (from rev 614, libs/swing-keyprefs/trunk/src/net) Copied: libs/swing-list/trunk/src/prj/net (from rev 614, libs/swing-list/trunk/src/net) Copied: libs/swing-list/trunk/src/tst/test (from rev 614, libs/swing-list/trunk/src/test) Copied: libs/swing-misc/trunk/src/prj/net (from rev 614, libs/swing-misc/trunk/src/net) Copied: libs/swing-prefs/trunk/src/prj/net (from rev 614, libs/swing-prefs/trunk/src/net) Copied: libs/swing-prefs/trunk/src/tst/test (from rev 614, libs/swing-prefs/trunk/src/test) Copied: libs/swing-proxyprefs/trunk/src/prj/net (from rev 614, libs/swing-proxyprefs/trunk/src/net) Copied: libs/swing-tod/trunk/src/prj/net (from rev 614, libs/swing-tod/trunk/src/net) Copied: libs/swing-treetable/trunk/src/prj/net (from rev 614, libs/swing-treetable/trunk/src/net) Copied: libs/taglets/trunk/src/prj/net (from rev 614, libs/taglets/trunk/src/net) Copied: libs/util/trunk/src/prj/net (from rev 614, libs/util/trunk/src/net) Copied: libs/util/trunk/src/tst/test (from rev 614, libs/util/trunk/src/test) Copied: libs/xml/trunk/src/prj/net (from rev 614, libs/xml/trunk/src/net) Deleted: progs/jeduca/trunk/src/overview.html =================================================================== --- progs/jeduca/trunk/src/overview.html 2007-09-23 20:21:52 UTC (rev 614) +++ progs/jeduca/trunk/src/overview.html 2007-09-23 21:19:05 UTC (rev 615) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de"> - <head> - <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /> - <title>API Documentation overview for JAPI JEduca</title> - </head> - <body> - <p> - API Documentation overview for JAPI JEduca. - </p> - <p> - JAPI JEduca is a software for running electronic tests. - Currently it supports multiple choice test and uses the same file format as KEduca. - </p> - </body> -</html> Copied: progs/jeduca/trunk/src/prj/net (from rev 614, progs/jeduca/trunk/src/net) Copied: progs/jeduca/trunk/src/prj/overview.html (from rev 614, progs/jeduca/trunk/src/overview.html) =================================================================== --- progs/jeduca/trunk/src/prj/overview.html (rev 0) +++ progs/jeduca/trunk/src/prj/overview.html 2007-09-23 21:19:05 UTC (rev 615) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de"> + <head> + <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /> + <title>API Documentation overview for JAPI JEduca</title> + </head> + <body> + <p> + API Documentation overview for JAPI JEduca. + </p> + <p> + JAPI JEduca is a software for running electronic tests. + Currently it supports multiple choice test and uses the same file format as KEduca. + </p> + </body> +</html> Copied: tools/cstyle/trunk/src/prj/net (from rev 614, tools/cstyle/trunk/src/net) Copied: tools/cstyle/trunk/src/tst/test (from rev 614, tools/cstyle/trunk/src/test) Copied: tools/findLongestPath/trunk/src/prj/net (from rev 614, tools/findLongestPath/trunk/src/net) Copied: tools/fontbrowser/trunk/src/prj/net (from rev 614, tools/fontbrowser/trunk/src/net) Copied: tools/jwget/trunk/src/prj/net (from rev 614, tools/jwget/trunk/src/net) Copied: tools/keystrokes/trunk/src/prj/net (from rev 614, tools/keystrokes/trunk/src/net) Copied: tools/prefsbrowser/trunk/src/prj/net (from rev 614, tools/prefsbrowser/trunk/src/net) Copied: tools/string2bytes/trunk/src/prj/net (from rev 614, tools/string2bytes/trunk/src/net) Copied: tools/string2bytes/trunk/src/tst/test (from rev 614, tools/string2bytes/trunk/src/test) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2007-09-27 20:45:49
|
Revision: 616 http://japi.svn.sourceforge.net/japi/?rev=616&view=rev Author: christianhujer Date: 2007-09-27 13:45:46 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Updated IntelliJ IDEA project files to reflect the new source code layout structure. Modified Paths: -------------- common/trunk/common.iml historic/trunk/historic.iml libs/argparser/trunk/libs-argparser.iml libs/finance/trunk/libs-finance.iml libs/io/trunk/libs-io.iml libs/lang/trunk/libs-lang.iml libs/logging/trunk/libs-logging.iml libs/net/trunk/libs-net.iml libs/registry/trunk/libs-registry.iml libs/swing-about/trunk/libs-swing-about.iml libs/swing-action/trunk/libs-swing-action.iml libs/swing-app/trunk/libs-swing-app.iml libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml libs/swing-extlib/trunk/libs-swing-extlib.iml libs/swing-font/trunk/libs-swing-font.iml libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml libs/swing-list/trunk/libs-swing-list.iml libs/swing-misc/trunk/libs-swing-misc.iml libs/swing-prefs/trunk/libs-swing-prefs.iml libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml libs/swing-recent/trunk/libs-swing-recent.iml libs/swing-tod/trunk/libs-swing-tod.iml libs/swing-treetable/trunk/libs-swing-treetable.iml libs/taglets/trunk/libs-taglets.iml libs/util/trunk/libs-util.iml libs/xml/trunk/libs-xml.iml progs/jeduca/trunk/JEduca.iml site/trunk/site.iml tools/cstyle/trunk/cstyle.iml tools/findLongestPath/trunk/findLongestPath.iml tools/fontbrowser/trunk/fontbrowser.iml tools/jwget/trunk/jwget.iml tools/keystrokes/trunk/keystrokes.iml tools/prefsbrowser/trunk/prefsbrowser.iml tools/string2bytes/trunk/string2bytes.iml Modified: common/trunk/common.iml =================================================================== --- common/trunk/common.iml 2007-09-23 21:19:05 UTC (rev 615) +++ common/trunk/common.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -2,9 +2,7 @@ <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> - </content> + <content url="file://$MODULE_DIR$" /> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="annotations" level="project" /> @@ -35,27 +33,6 @@ <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> Modified: historic/trunk/historic.iml =================================================================== --- historic/trunk/historic.iml 2007-09-23 21:19:05 UTC (rev 615) +++ historic/trunk/historic.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -44,27 +44,6 @@ <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> Modified: libs/argparser/trunk/libs-argparser.iml =================================================================== --- libs/argparser/trunk/libs-argparser.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/argparser/trunk/libs-argparser.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,9 +3,9 @@ <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/doc" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" /> + <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -54,27 +54,6 @@ <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> Modified: libs/finance/trunk/libs-finance.iml =================================================================== --- libs/finance/trunk/libs-finance.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/finance/trunk/libs-finance.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -2,9 +2,7 @@ <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> - </content> + <content url="file://$MODULE_DIR$" /> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module-library"> @@ -52,27 +50,6 @@ <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> Modified: libs/io/trunk/libs-io.iml =================================================================== --- libs/io/trunk/libs-io.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/io/trunk/libs-io.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,7 +3,7 @@ <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/prj" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -52,27 +52,6 @@ <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> Modified: libs/lang/trunk/libs-lang.iml =================================================================== --- libs/lang/trunk/libs-lang.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/lang/trunk/libs-lang.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,8 +3,8 @@ <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" /> + <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -53,27 +53,6 @@ <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> Modified: libs/logging/trunk/libs-logging.iml =================================================================== --- libs/logging/trunk/libs-logging.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/logging/trunk/libs-logging.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,7 +3,7 @@ <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/prj" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -52,27 +52,6 @@ <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> Modified: libs/net/trunk/libs-net.iml =================================================================== --- libs/net/trunk/libs-net.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/net/trunk/libs-net.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,7 +3,7 @@ <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/prj" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -53,27 +53,6 @@ <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> Modified: libs/registry/trunk/libs-registry.iml =================================================================== --- libs/registry/trunk/libs-registry.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/registry/trunk/libs-registry.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,7 +3,7 @@ <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/prj" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -52,27 +52,6 @@ <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> Modified: libs/swing-about/trunk/libs-swing-about.iml =================================================================== --- libs/swing-about/trunk/libs-swing-about.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/swing-about/trunk/libs-swing-about.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,7 +3,7 @@ <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/prj" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -53,27 +53,6 @@ <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> Modified: libs/swing-action/trunk/libs-swing-action.iml =================================================================== --- libs/swing-action/trunk/libs-swing-action.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/swing-action/trunk/libs-swing-action.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,8 +3,8 @@ <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" /> + <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -54,27 +54,6 @@ <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> Modified: libs/swing-app/trunk/libs-swing-app.iml =================================================================== --- libs/swing-app/trunk/libs-swing-app.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/swing-app/trunk/libs-swing-app.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,7 +3,7 @@ <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/prj" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -52,27 +52,6 @@ <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> Modified: libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml =================================================================== --- libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,7 +3,7 @@ <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/prj" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -55,27 +55,6 @@ <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> Modified: libs/swing-extlib/trunk/libs-swing-extlib.iml =================================================================== --- libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,8 +3,8 @@ <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" /> + <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -53,27 +53,6 @@ <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> Modified: libs/swing-font/trunk/libs-swing-font.iml =================================================================== --- libs/swing-font/trunk/libs-swing-font.iml 2007-09-23 21:19:05 UTC (rev 615) +++ libs/swing-font/trunk/libs-swing-font.iml 2007-09-27 20:45:46 UTC (rev 616) @@ -3,7 +3,7 @@ <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/prj" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -53,27 +53,6 @@ <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) &am... [truncated message content] |
From: <chr...@us...> - 2007-09-27 21:14:46
|
Revision: 617 http://japi.svn.sourceforge.net/japi/?rev=617&view=rev Author: christianhujer Date: 2007-09-27 14:14:42 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Adding stub for dircount Added Paths: ----------- tools/dircount/ tools/dircount/branches/ tools/dircount/tags/ tools/dircount/trunk/ tools/dircount/trunk/COPYING tools/dircount/trunk/build.xml tools/dircount/trunk/dircount.iml tools/dircount/trunk/src/ tools/dircount/trunk/src/prj/ tools/dircount/trunk/src/prj/net/ tools/dircount/trunk/src/prj/net/sf/ tools/dircount/trunk/src/prj/net/sf/japi/ tools/dircount/trunk/src/prj/net/sf/japi/dircount/ tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java Property changes on: tools/dircount/trunk ___________________________________________________________________ Name: svn:externals + common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk Added: tools/dircount/trunk/COPYING =================================================================== --- tools/dircount/trunk/COPYING (rev 0) +++ tools/dircount/trunk/COPYING 2007-09-27 21:14:42 UTC (rev 617) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, 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 Lesser 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 Street, 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 Lesser General +Public License instead of this License. Property changes on: tools/dircount/trunk/COPYING ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + LF Added: tools/dircount/trunk/build.xml =================================================================== (Binary files differ) Property changes on: tools/dircount/trunk/build.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Name: svn:eol-style + LF Added: tools/dircount/trunk/dircount.iml =================================================================== (Binary files differ) Property changes on: tools/dircount/trunk/dircount.iml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java =================================================================== --- tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java (rev 0) +++ tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java 2007-09-27 21:14:42 UTC (rev 617) @@ -0,0 +1,65 @@ +package net.sf.japi.dircount; + +import java.io.File; +import java.io.FileFilter; +import java.util.List; +import net.sf.japi.io.args.LogCommand; +import org.jetbrains.annotations.NotNull; + +/** + * A command that counts subdirectories and files. + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> + */ +public class DirCount extends LogCommand { + + /** Filter for directories. */ + private static final FileFilter DIR_FILTER = new FileFilter() { + /** {@inheritDoc} */ + public boolean accept(final File pathname) { + return pathname.isDirectory(); + } + }; + + /** {@inheritDoc} */ + @SuppressWarnings({"InstanceMethodNamingConvention"}) + public int run(@NotNull final List<String> args) throws Exception { + if (args.size() == 0) { + count("."); + } else { + int sum = 0; + for (final String dir : args) { + sum += count(dir); + } + System.out.println("Total: " + sum); + } + return 0; + } + + /** Prints and returns the number of files found in the specified directory. + * @param dir Directory to create count for. + * @return The number of files found in the specified directory. + */ + public int count(@NotNull final String dir) { + return count(new File(dir)); + } + + /** Prints and returns the number of files found in the specified directory. + * @param dir Directory to create count for. + * @return The number of files found in the specified directory. + * @throws IllegalArgumentException in case <var>dir</var> is not a directory. + */ + public int count(@NotNull final File dir) { + if (!dir.isDirectory()) { + throw new IllegalArgumentException(dir + " is not a directory."); + } + int count = 0; + final File[] subDirs = dir.listFiles(DIR_FILTER); + for (final File subDir : subDirs) { + count += count(subDir); + } + count += dir.listFiles().length; + System.out.println(dir + ": " + count); + return count; + } + +} // class DirCount Property changes on: tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java ___________________________________________________________________ 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-09-30 14:03:48
|
Revision: 626 http://japi.svn.sourceforge.net/japi/?rev=626&view=rev Author: christianhujer Date: 2007-09-30 07:03:43 -0700 (Sun, 30 Sep 2007) Log Message: ----------- Updated IntelliJ IDEA module files. Modified Paths: -------------- common/trunk/common.iml historic/trunk/historic.iml libs/finance/trunk/libs-finance.iml libs/io/trunk/libs-io.iml libs/lang/trunk/libs-lang.iml libs/logging/trunk/libs-logging.iml libs/net/trunk/libs-net.iml libs/registry/trunk/libs-registry.iml libs/swing-about/trunk/libs-swing-about.iml libs/swing-action/trunk/libs-swing-action.iml libs/swing-app/trunk/libs-swing-app.iml libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml libs/swing-extlib/trunk/libs-swing-extlib.iml libs/swing-font/trunk/libs-swing-font.iml libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml libs/swing-list/trunk/libs-swing-list.iml libs/swing-misc/trunk/libs-swing-misc.iml libs/swing-prefs/trunk/libs-swing-prefs.iml libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml libs/swing-recent/trunk/libs-swing-recent.iml libs/swing-tod/trunk/libs-swing-tod.iml libs/swing-treetable/trunk/libs-swing-treetable.iml libs/taglets/trunk/libs-taglets.iml libs/util/trunk/libs-util.iml libs/xml/trunk/libs-xml.iml progs/jeduca/trunk/JEduca.iml site/trunk/site.iml tools/cstyle/trunk/cstyle.iml tools/dircount/trunk/dircount.iml tools/findLongestPath/trunk/findLongestPath.iml tools/fontbrowser/trunk/fontbrowser.iml tools/jwget/trunk/jwget.iml tools/keystrokes/trunk/keystrokes.iml tools/prefsbrowser/trunk/prefsbrowser.iml tools/string2bytes/trunk/string2bytes.iml Modified: common/trunk/common.iml =================================================================== --- common/trunk/common.iml 2007-09-30 14:02:44 UTC (rev 625) +++ common/trunk/common.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -33,6 +33,27 @@ <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> Modified: historic/trunk/historic.iml =================================================================== --- historic/trunk/historic.iml 2007-09-30 14:02:44 UTC (rev 625) +++ historic/trunk/historic.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -44,6 +44,27 @@ <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> Modified: libs/finance/trunk/libs-finance.iml =================================================================== --- libs/finance/trunk/libs-finance.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/finance/trunk/libs-finance.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -50,6 +50,27 @@ <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> Modified: libs/io/trunk/libs-io.iml =================================================================== --- libs/io/trunk/libs-io.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/io/trunk/libs-io.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -52,6 +52,27 @@ <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> Modified: libs/lang/trunk/libs-lang.iml =================================================================== --- libs/lang/trunk/libs-lang.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/lang/trunk/libs-lang.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -53,6 +53,27 @@ <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> Modified: libs/logging/trunk/libs-logging.iml =================================================================== --- libs/logging/trunk/libs-logging.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/logging/trunk/libs-logging.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -52,6 +52,27 @@ <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> Modified: libs/net/trunk/libs-net.iml =================================================================== --- libs/net/trunk/libs-net.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/net/trunk/libs-net.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -53,6 +53,27 @@ <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> Modified: libs/registry/trunk/libs-registry.iml =================================================================== --- libs/registry/trunk/libs-registry.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/registry/trunk/libs-registry.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -52,6 +52,27 @@ <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> Modified: libs/swing-about/trunk/libs-swing-about.iml =================================================================== --- libs/swing-about/trunk/libs-swing-about.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-about/trunk/libs-swing-about.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -53,6 +53,27 @@ <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> Modified: libs/swing-action/trunk/libs-swing-action.iml =================================================================== --- libs/swing-action/trunk/libs-swing-action.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-action/trunk/libs-swing-action.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -54,6 +54,27 @@ <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> Modified: libs/swing-app/trunk/libs-swing-app.iml =================================================================== --- libs/swing-app/trunk/libs-swing-app.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-app/trunk/libs-swing-app.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -52,6 +52,27 @@ <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> Modified: libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml =================================================================== --- libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -55,6 +55,27 @@ <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> Modified: libs/swing-extlib/trunk/libs-swing-extlib.iml =================================================================== --- libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -53,6 +53,27 @@ <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> Modified: libs/swing-font/trunk/libs-swing-font.iml =================================================================== --- libs/swing-font/trunk/libs-swing-font.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-font/trunk/libs-swing-font.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -53,6 +53,27 @@ <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> Modified: libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml =================================================================== --- libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -55,6 +55,27 @@ <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> Modified: libs/swing-list/trunk/libs-swing-list.iml =================================================================== --- libs/swing-list/trunk/libs-swing-list.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-list/trunk/libs-swing-list.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -54,6 +54,27 @@ <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> Modified: libs/swing-misc/trunk/libs-swing-misc.iml =================================================================== --- libs/swing-misc/trunk/libs-swing-misc.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-misc/trunk/libs-swing-misc.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -53,6 +53,27 @@ <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> Modified: libs/swing-prefs/trunk/libs-swing-prefs.iml =================================================================== --- libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -55,6 +55,27 @@ <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> Modified: libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml =================================================================== --- libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -54,6 +54,27 @@ <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> Modified: libs/swing-recent/trunk/libs-swing-recent.iml =================================================================== --- libs/swing-recent/trunk/libs-swing-recent.iml 2007-09-30 14:02:44 UTC (rev 625) +++ libs/swing-recent/trunk/libs-swing-recent.iml 2007-09-30 14:03:43 UTC (rev 626) @@ -50,6 +50,27 @@ <option name="fileLocation" value="1" /> <option name=... [truncated message content] |
From: <chr...@us...> - 2008-03-11 22:54:14
|
Revision: 637 http://japi.svn.sourceforge.net/japi/?rev=637&view=rev Author: christianhujer Date: 2008-03-11 15:54:11 -0700 (Tue, 11 Mar 2008) Log Message: ----------- Added Replacer. Added Paths: ----------- tools/replacer/ tools/replacer/trunk/ tools/replacer/trunk/COPYING tools/replacer/trunk/build.xml tools/replacer/trunk/lib/ tools/replacer/trunk/lib/annotations.jar tools/replacer/trunk/lib/japi-lib-argparser-trunk.jar tools/replacer/trunk/src/ tools/replacer/trunk/src/prj/ tools/replacer/trunk/src/prj/net/ tools/replacer/trunk/src/prj/net/sf/ tools/replacer/trunk/src/prj/net/sf/japi/ tools/replacer/trunk/src/prj/net/sf/japi/tools/ tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/ tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.properties tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Substitution.java tools/replacer/trunk/src/tst/ tools/replacer/trunk/src/tst/test/ tools/replacer/trunk/src/tst/test/net/ tools/replacer/trunk/src/tst/test/net/sf/ tools/replacer/trunk/src/tst/test/net/sf/japi/ tools/replacer/trunk/src/tst/test/net/sf/japi/tools/ tools/replacer/trunk/src/tst/test/net/sf/japi/tools/replacer/ tools/replacer/trunk/src/tst/test/net/sf/japi/tools/replacer/ReplacerTest.java tools/replacer/trunk/src/tst/test/net/sf/japi/tools/replacer/SubstitutionTest.java Added: tools/replacer/trunk/COPYING =================================================================== --- tools/replacer/trunk/COPYING (rev 0) +++ tools/replacer/trunk/COPYING 2008-03-11 22:54:11 UTC (rev 637) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, 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 Lesser 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 Street, 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 Lesser General +Public License instead of this License. Property changes on: tools/replacer/trunk/COPYING ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + LF Added: tools/replacer/trunk/build.xml =================================================================== --- tools/replacer/trunk/build.xml (rev 0) +++ tools/replacer/trunk/build.xml 2008-03-11 22:54:11 UTC (rev 637) @@ -0,0 +1,226 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ DirCount is a program for converting Strings into byte arrays. + ~ Copyright (C) 2007 Christian Hujer + ~ + ~ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. + --> + +<project name="Replacer" default="compile"> + + <property name="module.version" value="0.1" /> + <property name="module.name" value="Replacer" /> + <property name="module.shortname" value="Replacer" /> + <property name="module.title" value="Replacer" /> + <property name="main.class" value="net.sf.japi.tools.replacer.Replacer" /> + + <taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" /> + + <target + name = "clean" + description = "Cleans Sandbox" + > + <delete dir="classes" /> + <delete dir="docs" /> + </target> + + <target + name = "compile" + description = "Compiles production classes" + > + <mkdir dir="classes/production/${module.shortname}" /> + <mkdir dir="classes/test/${module.shortname}" /> + <javac + srcdir="src/prj" + destdir="classes/production/${module.shortname}" + encoding="utf-8" + source="1.5" + target="1.5" + > + <classpath> + <fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" /> + <fileset dir="common/lib" includes="*.jar" excludes="LICENSE-*.jar" /> + </classpath> + <exclude name="test/**/*.java" /> + </javac> + <copy + todir="classes/production/${module.shortname}" + > + <fileset dir="src/prj" includes="**/*.properties" excludes="test/**/*.properties" /> + <fileset dir="src/prj" includes="META-INF/services/**" /> + </copy> + <copy + todir="classes/production/${module.shortname}" + > + <fileset dir="lib" includes="LICENSE-*" /> + <fileset dir="." includes="COPYING" /> + </copy> + </target> + + <target + name = "dist" + description = "Packs distribution archives." + depends = "clean, compile" + > + <!--depends = "clean, compile, doc" + --> + <delete dir="dist" /> + <mkdir dir="dist" /> + <property name="distName" value="dist/${module.name}-${module.version}" /> + <parallel> + <tar tarfile="${distName}.src.tar"> + <tarfileset dir="." prefix="${module.name}-${module.version}"> + <include name="src/**" /> + <include name="build.xml" /> + </tarfileset> + </tar> + <zip destfile="${distName}.src.zip"> + <zipfileset dir="." prefix="${module.name}-${module.version}"> + <include name="src/**" /> + <include name="build.xml" /> + </zipfileset> + </zip> + <jar destfile="${distName}.src.jar"> + <zipfileset dir="." prefix="${module.name}-${module.version}"> + <include name="src/**" /> + <include name="build.xml" /> + </zipfileset> + </jar> + <jar destfile="${distName}.jar"> + <zipfileset dir="classes/production/${module.shortname}"/> + <manifest> + <attribute name="Main-Class" value="${main.class}" /> + <attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /> + <attribute name="Implementation-Title" value="${module.name}" /> + <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" /> + <attribute name="Implementation-Version" value="${module.version}" /> + <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" /> + </manifest> + </jar> + <tar tarfile="${distName}.doc.tar"> + <tarfileset dir="." prefix="${module.name}-${module.version}"> + <include name="docs/**" /> + <include name="build.xml" /> + </tarfileset> + </tar> + <zip destfile="${distName}.doc.zip"> + <zipfileset dir="." prefix="${module.name}-${module.version}"> + <include name="docs/**" /> + <include name="build.xml" /> + </zipfileset> + </zip> + <jar destfile="${distName}.doc.jar"> + <zipfileset dir="." prefix="${module.name}-${module.version}"> + <include name="docs/**" /> + </zipfileset> + </jar> + </parallel> + <parallel> + <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" /> + <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" /> + <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" /> + <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" /> + <pack200 + src="${distName}.jar" + destfile="${distName}.pack.gz" + gzipoutput="true" + stripdebug="true" + effort="9" + keepfileorder="false" + modificationtime="latest" + deflatehint="false" + /> + </parallel> + <delete file="${distName}.src.tar" /> + <delete file="${distName}.doc.tar" /> + </target> + + <target + name = "doc" + description = "Creates public javadoc documentation." + > + <mkdir dir="docs/api" /> + <!--copy todir="docs/api" file="src/doc/api/public/copyright.html" /> + <copy todir="docs/api" file="src/doc/api/public/.htaccess" /--> + <javadoc + destdir = "docs/api" + access = "protected" + author = "yes" + version = "yes" + locale = "en_US" + use = "yes" + splitindex = "yes" + windowtitle = "JAPI Library ${module.title} ${module.version} API documentation" + doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation" + header = "JAPI Library ${module.title} ${module.version}<br />API Documentation" + footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation" + bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>" + serialwarn = "yes" + charset = "utf-8" + docencoding = "utf-8" + encoding = "utf-8" + source = "1.5" + linksource = "yes" + link = "${user.javadoc.link}" + > + <!-- + overview = "src/overview.html" + --> + <classpath> + <fileset dir="lib" includes="annotations.jar" /> + </classpath> + <sourcepath> + <pathelement path="${user.javadoc.javasrc}" /> + <pathelement path="src/prj" /> + </sourcepath> + <packageset + dir="src/prj" + defaultexcludes="yes" + > + <include name="net/**" /> + </packageset> + <tag enabled="true" name="retval" description="Return Values:" scope="methods" /> + <tag enabled="true" name="pre" description="Preconditions:" scope="methods,constructors" /> + <tag enabled="true" name="post" description="Postconditions:" scope="methods" /> + <tag enabled="true" name="invariant" description="Invariant:" scope="methods,fields" /> + <tag enabled="true" name="note" description="Notes:" /> + <tag enabled="true" name="warning" description="Warnings:" /> + <!--tag enabled="true" name="todo" description="Todo:" /--> + <taglet name="com.sun.tools.doclets.ToDoTaglet" path="" /> + <tag enabled="true" name="fixme" description="Fixme:" /> + <tag enabled="true" name="xxx" description="XXX:" /> + </javadoc> + </target> + + <target + name = "buildapp" + description = "Creates executable jar" + > + <property name="appName" value="${module.name}-${module.version}-app" /> + <jar destfile="${appName}.jar"> + <zipfileset dir="classes/production/${module.shortname}"/> + <zipgroupfileset dir="lib" includes="*.jar" excludes="... [truncated message content] |