Replace tabs with spaces

* alter LibraryLoader to use jlibloader

HEADER.txt

@@ -0,0 +1,36 @@
+This file is part of ${project}.
+
+Copyright (C) ${year} ${name} <${email}> 
+
+${project} 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 3 of the License, or
+(at your option) any later version.
+
+${project} 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 ${project}. If not, see <http://www.gnu.org/licenses/>.
+
+This file incorporates work covered by the following copyright and  
+permission notice:
+    Copyright (c) 1999-2004 Sourceforge JACOB Project.
+    All rights reserved. Originator: Dan Adler (http://danadler.com).
+    Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+
+    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 St, Fifth Floor, Boston, MA  02110-1301  USA

LICENSE

@@ -0,0 +1,619 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  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.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.

LICENSE.TXT

@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 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.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'cpp'
 apply plugin: 'maven'
+apply plugin: 'license'
 
 repositories {
 	maven {
@@ -10,13 +11,13 @@ repositories {
 }
 
 dependencies {
-	compile 'com.github.boukefalos:jlibloader:0.1'
+	compile 'com.github.boukefalos:jlibloader:0.2'
 	testCompile 'junit:junit:3.8.1'
 }
 
 group = 'com.github.boukefalos'
 project.archivesBaseName = 'jlibcom'
-version = '1.18'
+version = '1.15'
 
 task wrapper(type: Wrapper) {
 	gradleVersion = '1.12'
@@ -92,9 +93,6 @@ configurations {
 def deployer = uploadJni.repositories.mavenDeployer
 
 binaries.withType(SharedLibraryBinary) { binary ->
-	if (!buildable) {
-		return
-	}
 	def variantName = "${targetPlatform.operatingSystem.name}-${targetPlatform.architecture.name}"
 	def taskName = "jar-${variantName}"
 	def nativeJar = project.tasks.findByName(taskName)
@@ -114,7 +112,8 @@ binaries.withType(SharedLibraryBinary) { binary ->
 		jniPom.scopeMappings.mappings.clear()
 	}
 	def builderTask = binary.tasks.builder
-	nativeJar.into(project.group.replace('.', '/') + '/' + variantName) { from builderTask.outputFile }
+	def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}" 
+	nativeJar.into(libraryDirectory) { from builderTask.outputFile }
 	nativeJar.dependsOn builderTask
 }
 
@@ -135,9 +134,27 @@ mainPom.withXml { provider ->
 	def dep = deps.appendNode('dependency')
 	dep.appendNode('groupId', 'com.github.boukefalos')
 	dep.appendNode('artifactId', 'jlibloader')
-	dep.appendNode('version', '0.1')
+	dep.appendNode('version', '0.2')
 }
 
 jar {
 	from sourceSets.main.allSource
+}
+
+buildscript {
+	repositories {
+		jcenter()
+	}
+	dependencies {
+		classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
+	}
+}
+
+license {
+	header rootProject.file('HEADER.txt')
+	ext.year = Calendar.getInstance().get(Calendar.YEAR)
+	ext.name = 'Rik Veenboer'
+	ext.email = 'rik.veenboer@gmail.com'
+	ext.project = 'jlibcom'
+	include "**/*.java"
 }

docs/EventCallbacks.html

@@ -1,88 +0,0 @@
-<html>
-
-<head>
-<title>Jacob can register Java classes for MS application events or callbacks</title>
-<BODY>
-<H2>Overview</H2>
-Jacob can register Java classes for MS application events or callbacks.  
-
-<H2>Sequence of Events</H2>
-The normal flow for this is:
-<OL>
-<LI>Application thread creates an instance of the event handler and registers it with Jacob
-<LI>The application continues on doing other work.
-<LI>Some time later, the MS application takes some action and initiates the event callback.
-<LI>The Java VM receives the event and spins up a new thread to handle it.
-<LI>The Jacob jni EventProxy in the dll is called by the VM.
-<LI>The Jacob jni EventProxy creates Variant objects to handle the parameters of the passed in event.
-<LI>The Jacob jni EventProxy sends the name of the callback and the array of Variant objects to the Java  InvocationProxy that was registered to catch events.
-<LI>The Java InvocationProxy uses reflection to map the event name to a method name with the exact same name.
-<LI>The Java InvocationProxy sends the message to the registered event handler and returns if the event handler is of type void (standard behavior).  
-<LI>The Java InvocationProxy sends the message to the registered event handler and returns the Variant that resulted from the call back to the Jacob jni EventProxy that then returns it to the windows calling program.
-</OL> 
-
-<H2>SWING Issues</H2>
-Swing developers should note that this message comes in on a thread other than the event thread.  
-All objects receiving events that require user intervention or drawing in the UI should use 
-invokeLater() to post requests for actions onto the event queue.  Failure to do so will 
-insure random failures in the GUI.
-Java Web Start (JWS) and other launchers can have additional issues related to the class loader.  
-The Jacob C++ library uses FindClass() to find the Variant class when building the parameter list. 
-FindClass() uses the system class loader which includes only the classes specified at run time or 
-in the CLASSPATH.  Most of the application classes in this situation live in an alternate set of 
-class loaders that were created when the launcher located and ran the application classes.  This 
-means that the search for Variant will fail usually with the silent and immediate termination of 
-the Java application.  The thread classloader probably can<61>t be used to try and find the class 
-because this new thread does not have a classloader associated with it other than the system class 
-loader.  The end result is that the Variant class needs to be located via other means and that the 
-thread classloader should be set to be the context class loader of the event handler class.
-
-<H2>1.8 and 1.9 behavior</H2>
-The Jacob EventProxy class has been modified (off of the 1.8 tree) so that it takes a two step approach  towards fixing these problems.
-<OL>
-<LI>The EventProxy constructor now accepts an extra object, an instance of the Variant class.  This gives the EventProxy a way to get to the Variant class and thus to its classloader. All of the callers of the constructor have been modified to pass a Variant object to the EventProxy without programmer intervention.
-<LI>EventProxy first attempts to locate the Variant class using FindClass()
-<LI>Failing that, it looks to see if a variant object had been passed in. If so, it calls class() and goes from there.  
-<LI>If all that fails, it logs a message and then fails in the spectacular fashion of the previous versions.
-</OL>
-<p>
-<H2>1.10 behavior</H2>
-The Jacob EventProxy class has been modified so that it takes a different approach towards fixing this problem.
-<OL>
-<LI>All objects that request event notification are now wrapped in a Java InvocationProxy 
-	so that a standard interface is always presented to the JNI EventProxy object.
-<LI>The EventProxy constructor accepts any Java class.  It wraps the class if it is not an
-	InvocationProxy or uses just the passed in object if it is an InvocationProxy.
-	The JNI layer talks to the InvocationProxy instead of talking directly to the event listener
-	as in previous releases.
-<LI>The Java InvocationProxy has a method on it that will return the Variant class that the 
-	EventProxy. The JNI code uses this method to acquire the class so that it can call newInstance().
-</OL>
-Developers can receive call back events in JWS other Java launching programs without implementing any additional code.  They should be aware that their callback methods may need to set the class loader. If they expect to create any objects.:
-<pre>
-      Public xxx someHandler(Variant[] foo){
-            Thread.currentThread().setContextClassLoader(
-                  this.getClass().getClassLoader());
-            // do something
-      }
-</pre>
-There may still be a dual event queue issue in JWS applications that needs to be looked at.
-
-<p>
-<H2>1.12 Experimental Behavior</H2>
-Release 1.12 adds experimental support for event handlers that accept java objects as parameters
-to closer match the signature of the windows callback.  New ActiveXDispatchEvents and 
-ActiveXInvocationProxy operate in tandem in the same way as DispatchEvents and InvocationProxy.
-DispatchEvents overrides getInvocationProxy() to create a new ActiveXInvocationProxy in place
-of the normal InvocationProxy.  ActiveXInvocationProxy has its own invoke() method that uses
-reflection to call back using java objects as parameters.
-<p>
-Issues with this approach
-<ul>
-<li>Event callbacks that use java signatures do not support parameter modification.  Many 
-windows callbacks let a user reject an event that is about to happen by modifying one of the
-parameters.  In this situation, the old DispatchEvents/InvocationProxy pair must be used instead
-of the new handlers.
-</ul>
-</body>
-</html>

docs/JacobComLifetime.html

@@ -1,51 +0,0 @@
-<H1>COM Object Lifetime in JACOB</H1>
-<p>
-<H2>introduction</H2>
-<p>
-JACOB Version 1.7 implements a new
-<a href="JacobThreading.html">Threading Model</a> that is more
-compatible with COM apartments. There is also an incompatibility
-between the Java object lifetime model and that of COM objects.
-COM Objects live and die by their reference count, whereas Java
-objects are collected by the Garbage Collector (GC) based on algortihms
-that are hidden from the user.
-<H2>COM Object Lifetime in JACOB Prior to Version 1.7</H2>
-<p>
-In version 1.6 and earlier, JACOB objects which wrapped COM objects
-had <code>finalize()</code> methods that would call a native
-<code>release</code> method which would call a COM <code>Release</code>.
-<p>
-This has many problems. For one thing, the GC may take a long time to
-kick in and resource consumption may grow. However, the more problematic
-issue is that finalizers are called from a separate thread, and, as was
-discussed in the <a href="JacobThreading.html">Threading Model</a>
-document, this can result in COM errors if the object is running in an
-STA. Even if the object is running in an MTA, the finalizer may decide
-to run after we have terminated the thread that holds the component, in
-which case we would get fatal errors and crashes.
-<H2>COM Object Lifetime in JACOB in Version 1.7</H2>
-<p>
-In Version 1.7, all JACOB objects which wrap COM objects extend
-<code>com.jacob.com.JacobObject</code>. This object has some special
-code to register itself with a <code>com.jacob.com.ROT</code> object
-which represents a Running Object Table (ROT). This table maps a
-Thread to the set of JacobObjects created in that thread. Therefore,
-when you call <code>ComThread.Release()</code>, the ROT checks whether
-that thread has created any objects, and these objects are released
-by calling their native <code>release</code> method (which is public).
-<p>
-This lifetime management method ties the lifecycle to the thread's
-lifecycle rather than the GC. The JacobObject's still have finalizers,
-but they will typically not perform the native <code>release</code>
-since that has already been called. The native <code>release</code>
-methods were written such that you can call them multiple times without
-worrying - since they zero out the native pointer when called the first
-time.
-<p>
-If you choose to call <code>release</code> methods on your objects
-yourself, that is allowed. In that case, when the thread is released
-the release calls will be no-ops.
-<p>
-It becomes important for you to call <code>ComThread.Release()</code>
-on any thread before you allow it to exit, otherwise you may get
-some random crashes later on in your code.

docs/JacobThreading.html

@@ -1,410 +0,0 @@
-<H1>COM Apartments in JACOB</H1>
-<p>
-<H2>introduction</H2>
-<p>
-The COM model for Threading differs from the Java model.
-In COM, each component can declare whether or not it support
-multi-threading.
-
-You can find some basic information about COM threading at:
-<p>
-<a href="http://www.execpc.com/~gopalan/com/com_threading.html">
-http://www.execpc.com/~gopalan/com/com_threading.html</a>
-<p>
-<a href="www.microsoft.com/msj/0297/apartment/apartment.htm">
-www.microsoft.com/msj/0297/apartment/apartment.htm</a>
-<p>
-<a href="http://www.cswl.com/whiteppr/white/multithreading.html">
-http://www.cswl.com/whiteppr/white/multithreading.html
-</a>
-<p>
-The term <b>Single Threaded Apartment (STA)</b> refers to a thread
-where all COM objects created in that thread are 
-single-threaded. This can manifest itself in two ways:
-<br>
-Either all calls into that component are made from the same thread
-that created the component
-<br>
-OR any call that is made from another thread gets serialized by COM.
-This serialization of calls is done by using a Windows message loop and
-posting messages to a hidden window (I'm not kidding). The way COM 
-achieves this is by requiring any other thread to make calls through
-a local Proxy object rather than the original object (more on this 
-when we discuss the JACOB DispatchProxy class).
-<p>
-What does this mean for a Java application? If you are using a component
-that declares itself as <b>ThreadingModel "Apartment"</b> (you can
-find this out by looking in the registry under its CLSID), and you plan
-to create, use and destroy this component in one thread - then you are
-following the rules of an STA and you can declare the thread as an
-STA thread.
-<p>
-On the other hand, if you need to make method calls from another thread
-(e.g. in a servlet) then you have a few choices. Either you 
-create the component in its own STA, by extending 
-<code>com.jacob.com.STA</code>, and use the 
-<code>com.jacob.com.DispatchProxy</code> class to pass the Dispatch
-pointer between threads, or you can declare your thread as an MTA
-thread. In that case, COM will make
-the cross-thread calls into the STA that is running your component.
-If you create an Apartment threaded component in the MTA,
-COM will automatically create an STA for you and put your
-component in there, and then marshall all the calls. 
-<p>
-This brings us to the notion of a <b>Main STA</b>. COM requires that
-if there is any Apartment threaded component in your application, then
-the first STA created is tagged as the <b>Main STA</b>. COM uses the
-Main STA to create all the Apartment threaded components that are
-created from an MTA thread. The problem is that if you have already
-created an STA, then COM will pick that as the Main STA, and if you
-ever exit that thread - the whole application will exit.
-
-<H2>COM Threads in JACOB Prior to Version 1.7</H2>
-<p>
-Up until version 1.7 of JACOB, there was only one model available
-in JACOB:
-<ul>
-<li>
-Before version 1.6: All threads were automatically initialized as STAs.
-</li>
-<li>
-In version 1.6: All threads were automatically initialized as MTAs.
-</li>
-</ul>
-<p>
-The reason for the change in default was that tagging a Java thread
-as an STA can cause problems. Any Java Swing application, as well as
-servlets and applets need to be able to make calls from multiple
-threads. If you try to make COM method calls across STA threads - it
-will fail!
-<p>
-In most cases, the default chosen by JACOB 1.6 (MTA) works fine, however
-there are some notable exceptions that have caused people grief. One
-such exception is in the case of MAPI. It turns out that if you try to
-create a MAPI object from an MTA thread - it simply fails and exits. 
-This has caused some people to recompile JACOB 1.6 back with the STA
-default.
-<p>
-There is another problem with MTA threads: when you are using Apartment
-threaded components, we already noted that COM will create the 
-components in the Main STA. If one doesn't exist, COM will create it.
-However, this means that <b>all</b> Apartment threaded components will
-be created in the <b>same STA</b>. This creates a bottleneck, and a
-dependency between unrelated components. Also, if that STA exits, then
-all components are destroyed and the application will likely crash.
-
-<H2>COM Threads in JACOB Version 1.7</H2>
-<p>
-In Version 1.7 we have added finer grained control to allow the
-Java programmer to control how COM creates its components.
-Unfortunately, this means that you need to have a pretty good 
-understanding of the dark and mystical subject of COM Apartments.
-There are a few different cases you need to consider:
-<H3>Default</H3>
-<p>
-If you simply run code that was created in Version 1.6 and ignore
-the COM threading issue, then you will get the same behavior as in 1.6:
-Each java thread will be an MTA thread, and all Apartment threaded
-components will be created by COM in its own Main STA. This typically
-works for most applications (exceptions noted above).
-<H3>Create Your Own Apartment</H3>
-<p>
-To declare an MTA thread use the following template:
-<br>
-<pre>
-<code>
-ComThread.InitMTA();
-...
-...
-ComThread.Release();
-</pre>
-</code>
-<br>
-If you want JACOB to create its own Main STA (rather than having COM
-choose an STA for you), then you should use:
-<br>
-<code>
-<pre>
-Thread 1:
-ComThread.InitMTA(true); // a true tells JACOB to create a Main STA
-...
-...
-ComThread.Release();
-...
-Thread 2:
-ComThread.InitMTA(); 
-...
-...
-ComThread.Release();
-...
-...
-ComThread.quitMainSTA();
-</pre>
-</code>
-<br>
-In this case, you can also create the Main STA explicitly:
-<br>
-<code>
-<pre>
-ComThread.startMainSTA();
-...
-...
-Thread 1:
-ComThread.InitMTA();
-...
-...
-ComThread.Release();
-...
-Thread 2:
-ComThread.InitMTA(); 
-...
-...
-ComThread.Release();
-...
-...
-ComThread.quitMainSTA();
-</pre>
-</code>
-<br>
-In the latter case, all Apartment threaded components will be created in
-JACOB's main STA. This still has all the problems of components
-sharing the same Main STA and creating a bottleneck. To avoid that,
-you can also create STA threads yourself:
-<br>
-<code>
-<pre>
-ComThread.startMainSTA();
-...
-...
-Thread 1:
-ComThread.InitSTA();
-...
-...
-ComThread.Release();
-...
-Thread 2:
-ComThread.InitMTA(); 
-...
-...
-ComThread.Release();
-...
-...
-ComThread.quitMainSTA();
-</pre>
-</code>
-<br>
-In this example, thread 1 is an STA and thread 2 is an MTA. You could
-omit the call to ComThread.startMainSTA(), but if you do, then COM will
-make the first STA your main one, and then if you exit that thread,
-the application will crash.
-<p>
-Actually, Thread 1 is <i>almost</i> an STA. It's lacking a windows
-message loop. So, this type of STA is fine as long as you are creating
-a component and using it in the same thread, and not makind event
-callbacks.
-<H3>JACOB's STA Class</H3>
-<p>
-If you want to create an true STA where you can create a component and
-then let other threads call methods on it, then you need a windows
-message loop. JACOB provides a class called:
-<code>com.jacob.com.STA</code> which does exactly this.
-<code>
-<pre>
-public class com.jacob.com.STA extends java.lang.Thread 
-{
-    public com.jacob.com.STA();
-    public boolean OnInit(); // you override this
-    public void OnQuit(); // you override this
-    public void quit();  // you can call this from ANY thread
-}
-</pre>
-</code>
-<p>
-The STA class extends 
-<code>java.lang.Thread</code> and it provides you with two methods
-that you can override: <code>OnInit</code> and <code>OnQuit</code>.
-These methods are called from the thread's <code>run</code> method
-so they will execute in the new thread. These methods allow you to
-create COM components (Dispatch objects) and release them.
-To create an STA, you subclass it and override the OnInit.
-<p>
-The <code>quit</code> method is the <b>only</b> other method that
-can be called from any thread. This method uses the Win32 function
-<code>PostThreadMessage</code> to force the STA's windows message loop
-to exit, thereby terminating the thread.
-<p>
-You will then need to make calls into the component that is running
-in the STA thread. If you simply try to make calls from another thread
-on a Dispatch object created in the STA thread, you will get a COM
-Exception. For more details see: 
-<a href="http://www.develop.com/effectivecom">
-Don Box 'Effective COM' Rule 29</a>: Don't Access raw
-interface pointers across apartment boundaries.
-<H3>The DispatchProxy Class</H3>
-Since you cannot call methods directly on a Dispatch object created
-in another STA JACOB provides a method for the class that created
-the Dispatch object to marshal it to your thread. This is done via
-the <code>com.jacob.com.DispatchProxy</code> class.
-<code>
-<pre>
-public class DispatchProxy extends JacobObject {
-    public DispatchProxy(Dispatch);
-    public Dispatch toDispatch();
-
-    public native void release();
-    public void finalize();
-}
-</code>
-</pre>
-<p>
-This class works as follows: the thread that created the Dispatch
-object constructs an instance of DispatchProxy(Dispatch) with the
-Dispatch as a parameter. This instance can then be accessed from
-another thread, which will invoke its <code>toDispatch</code> method
-proxy as if it were local to your thread. COM will do the inter-thread
-marshalling transparently.
-<p>
-The following example is part of samples/test/ScriptTest2.java in the
-JACOB distribution. It shows how you can create the ScriptControl
-in one STA thread and make method calls on it from another:
-<code>
-<pre>
-import com.jacob.com.*;
-import com.jacob.activeX.*;
-
-class ScriptTest2 extends STA
-{
-  public static ActiveXComponent sC;
-  public static Dispatch sControl = null;
-  public static DispatchProxy sCon = null;
-
-  public boolean OnInit()
-  {
-     try
-     {
-       System.out.println("OnInit");
-       System.out.println(Thread.currentThread());
-       String lang = "VBScript";
-
-       sC = new ActiveXComponent("ScriptControl");
-       sControl = (Dispatch)sC.getObject();
-
-       // sCon can be called from another thread
-       sCon = new DispatchProxy(sControl);
-
-       Dispatch.put(sControl, "Language", lang);
-       return true;
-     }
-     catch (Exception e)
-     {
-       e.printStackTrace();
-       return false;
-     }
-  }
-
-  public void OnQuit()
-  {
-     System.out.println("OnQuit");
-  }
-
-  public static void main(String args[]) throws Exception
-  {
-    try {
-      ComThread.InitSTA();
-      ScriptTest2 script = new ScriptTest2();
-      Thread.sleep(1000);
-
-      // get a thread-local Dispatch from sCon
-      Dispatch sc = sCon.toDispatch();
-
-      // call a method on the thread-local Dispatch obtained
-      // from the DispatchProxy. If you try to make the same
-      // method call on the sControl object - you will get a
-      // ComException.
-      Variant result = Dispatch.call(sc, "Eval", args[0]);
-      System.out.println("eval("+args[0]+") = "+ result);
-      script.quit();
-      System.out.println("called quit");
-    } catch (ComException e) {
-      e.printStackTrace();
-    }
-    finally
-    {
-      ComThread.Release();
-    }
-  }
-}
-</pre>
-</code>
-<p>
-You can try to modify the <code>Dispatch.call</code> invocation in
-the main thread to use <code>sControl</code> directly, and you will see
-that it fails. Notice that once we construct the ScriptTest2 object
-in the main thread, we sleep for a second to allow the other thread
-time to initialize itself.
-<p>
-The STA thread calls <code>sCon = new DispatchProxy(sControl);</code>
-to save a global reference to the DispatchProxy that represents the
-<code>sControl</code> object. The main thread then calls:
-<code>Dispatch sc = sCon.toDispatch();</code> to get a local Dispatch
-proxy out of the DispatchProxy object.
-<p>
-At most <b>one(!)</b>
-thread can call toDispatch(), and the call can be made only once.
-This is because a IStream object is used to pass the proxy, and
-it is only written once and closed when you read it.
-If you need multiple threads to access a Dispatch pointer, then
-create that many DispatchProxy objects. For more details please
-refer to the Don Box reference above.
-
-
-<H3>Recommended Procedure</H3>
-<ul>
-<li>
-It is recommended that you always allow JACOB to manage the main STA
-rather than letting COM create one on its own or tag one of yours.
-</li>
-<li>
-Declare an STA thread using ComThread.InitSTA() 
-if all your
-method calls for that component are going to come from the same thread.
-</li>
-<li>
-If you want an STA thread that allows other threads to call into it,
-use the <code>com.jacob.com.STA</code> class as outlined above.
-</li>
-<li>
-If you have a COM component that declares its ThreadingModel as
-"Free" or "Both", then use the MTA.
-</li>
-<li>
-In most cases, if you need to make method calls from multiple threads,
-you can simply
-use MTA threads, and allow COM to create the components in
-the Main STA. You should only create your own STA's and DispatchProxy
-if you understand COM well enough to know when the MTA solution
-will fail or have other shortcomings.
-<p>
-There are 3 examples in the samples/test directory that demonstrate
-these cases:
-<p>
-ScriptTest.java - creates an STA for the ScriptControl component and
-runs all its method calls from that STA.
-<p>
-ScriptTest2.java - creates a separate STA thread, and makes
-method calls into the component from another thread using DispatchProxy.
-<p>
-ScriptTest3.java - creates a separate MTA thread, and makes method
-calls into the component from another MTA thread. This is simpler
-than ScriptTest2 for most applications.
-<p>
-<h3>Default Threading Model</h3>
-If you create a new thread, and don't call 
-<code>ComThread.InitSTA()</code> or  <code>ComThread.InitMTA()</code>
-on it, then the first time your java code creates a JacobObject, it
-will try to register itself with the ROT, and when it sees that the
-current thread is not initialized, it will initialize it as MTA.
-This means that the code to do this is no longer inside the native
-jni code - it is now in the <code>com.jacob.com.ROT</code> class.
-For more details on the ROT, see the 
-<a href="JacobComLifetime.html">Object Lifetime</a> document.

samples/README.txt

@@ -1,8 +0,0 @@
-The ADO sample is a wrapper for the ADO classes. This demonstrates how
-to write JACOB wrappers.
-
-The applet sample shows how to use JACOB in an applet. The trick is to
-initialize and use the COM object in the same thread.
-
-The test directory has numerous tests that test various features
-of the JACOB functionality.

samples/com/jacob/samples/JavaWebStart/DLLFromJARClassLoader.java

@@ -1,74 +0,0 @@
-package com.jacob.samples.JavaWebStart;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import com.jacob.com.LibraryLoader;
-
-/**
- * It is sometimes necessary to run Jacob without being able to install the dll
- * on the client machine. This is true in JavaWebStart (JWS) and possibly Applet
- * (assuming security allows access to the file system). The obvious thing to do
- * here is to jar up the Jacob.dll so that it can be downloaded the client along
- * with the rest of the resources. This is simple except that the System.Load()
- * function does not search jar files for DLLs. It searches the classpath. The
- * work around to this problem is to write the DLL to a temporary file and then
- * explicitly load the DLL calling passing the full path to the temporary file.
- * 
- * The following code demonstrates this idea.
- * 
- * @author joe
- * 
- */
-public class DLLFromJARClassLoader {
-
-	/**
-	 * Load the DLL from the classpath rather than from the java path. This code
-	 * uses this class's class loader to find the dell in one of the jar files
-	 * in this class's class path. It then writes the file as a temp file and
-	 * calls Load() on the temp file. The temporary file is marked to be deleted
-	 * on exit so the dll is deleted from the system when the application exits.
-	 * <p>
-	 * Derived from ample code found in Sun's java forums <p.
-	 * 
-	 * @return true if the native library has loaded, false if there was a
-	 *         problem.
-	 */
-	public boolean loadLibrary() {
-		try {
-			// this assumes that the dll is in the root dir of the signed
-			// jws jar file for this application.
-			//
-			// Starting in 1.14M6, the dll is named by platform and architecture
-			// so the best thing to do is to ask the LibraryLoader what name we
-			// expect.
-			// this code might be different if you customize the name of
-			// the jacob dll to match some custom naming convention
-			InputStream inputStream = getClass().getResource(
-					"/" + LibraryLoader.getPreferredDLLName() + ".dll")
-					.openStream();
-			// Put the DLL somewhere we can find it with a name Jacob expects
-			File temporaryDll = File.createTempFile(LibraryLoader
-					.getPreferredDLLName(), ".dll");
-			FileOutputStream outputStream = new FileOutputStream(temporaryDll);
-			byte[] array = new byte[8192];
-			for (int i = inputStream.read(array); i != -1; i = inputStream
-					.read(array)) {
-				outputStream.write(array, 0, i);
-			}
-			outputStream.close();
-			temporaryDll.deleteOnExit();
-			// Ask LibraryLoader to load the dll for us based on the path we
-			// set
-			System.setProperty(LibraryLoader.JACOB_DLL_PATH, temporaryDll
-					.getPath());
-			LibraryLoader.loadJacobLibrary();
-			return true;
-		} catch (Throwable e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-}

samples/com/jacob/samples/MathProj/MathTest.java

@@ -1,83 +0,0 @@
-package com.jacob.samples.MathProj;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.Dispatch;
-import com.jacob.com.DispatchEvents;
-import com.jacob.com.Variant;
-
-/**
- * This example uses the MathTest sample VB COM DLL under the MathProj directory
- * <p>
- * May need to run with some command line options (including from inside
- * Eclipse). Look in the docs area at the Jacob usage document for command line
- * options.
- */
-class MathTest {
-	/**
-	 * standard main program to run the sample
-	 * 
-	 * @param args
-	 *            command line parameters
-	 */
-	public static void main(String[] args) {
-		MathTest me = new MathTest();
-		me.runTest();
-	}
-
-	/** default constructor */
-	public MathTest() {
-	}
-
-	/**
-	 * not clear why we need a class and run method but that's the way it was
-	 * written
-	 */
-	public void runTest() {
-		// deprecated
-		// System.runFinalizersOnExit(true);
-		Dispatch test = new ActiveXComponent("MathTest.Math");
-		TestEvents te = new TestEvents();
-		DispatchEvents de = new DispatchEvents(test, te);
-		if (de == null) {
-			System.out
-					.println("null returned when trying to create DispatchEvents");
-		}
-		System.out.println(Dispatch.call(test, "Add", new Variant(1),
-				new Variant(2)));
-		System.out.println(Dispatch.call(test, "Mult", new Variant(2),
-				new Variant(2)));
-		Variant v = Dispatch.call(test, "Mult", new Variant(2), new Variant(2));
-		// this should return false
-		System.out.println("v.isNull=" + v.isNull());
-		v = Dispatch.call(test, "getNothing");
-		// these should return nothing
-		System.out.println("v.isNull=" + v.isNull());
-		System.out.println("v.toDispatch=" + v.toDispatch());
-	}
-
-	/**
-	 * 
-	 * sample class to catch the events
-	 * 
-	 */
-	public class TestEvents {
-		/**
-		 * catches the DoneAdd event
-		 * 
-		 * @param args
-		 */
-		public void DoneAdd(Variant[] args) {
-			System.out.println("DoneAdd called in java");
-		}
-
-		/**
-		 * catches the DoneMult event
-		 * 
-		 * @param args
-		 */
-		public void DoneMult(Variant[] args) {
-			System.out.println("DoneMult called in java");
-		}
-	}
-
-}

samples/com/jacob/samples/access/Access.java

@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
- *
- * 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 St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-package com.jacob.samples.access;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.ComThread;
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-/**
- * May need to run with some command line options (including from inside
- * Eclipse). Look in the docs area at the Jacob usage document for command line
- * options.
- * 
- */
-class Access {
-	/**
-	 * the main loop for the test
-	 * 
-	 * @param args
-	 * @throws Exception
-	 */
-	public static void main(String[] args) throws Exception {
-		ComThread.InitSTA();
-		// original test used this
-		// ActiveXComponent ax = new ActiveXComponent("DAO.PrivateDBEngine");
-		// my xp box with a later release of access needed this
-		ActiveXComponent ax = new ActiveXComponent("DAO.PrivateDBEngine.35");
-		// this only works for access files pre-access-2000
-		// this line doesn't work on my xp box in Eclipse
-		// Dispatch db = open(ax, ".\\sample2.mdb");
-		// this works when running in eclipse because the test cases run pwd
-		// project root
-		Dispatch db = open(ax, "samples/com/jacob/samples/access/sample2.mdb");
-		String sql = "select * from MainTable";
-		// make a temporary querydef
-		Dispatch qd = Dispatch.call(db, "CreateQueryDef", "").toDispatch();
-		// set the SQL string on it
-		Dispatch.put(qd, "SQL", sql);
-		Variant result = getByQueryDef(qd);
-		// the 2-d safearray is transposed from what you might expect
-		System.out.println("resulting array is " + result.toSafeArray());
-		close(db);
-		System.out.println("about to call ComThread.Release()");
-		ComThread.Release();
-	}
-
-	/**
-	 * Open a database
-	 * 
-	 * @param ax
-	 * @param fileName
-	 * @return dispatch object that was opened
-	 */
-	public static Dispatch open(ActiveXComponent ax, String fileName) {
-		Variant f = new Variant(false);
-		// open the file in read-only mode
-		Variant[] args = new Variant[] { new Variant(fileName), f, f };
-		Dispatch openDB = ax.invoke("OpenDatabase", args).toDispatch();
-		return openDB;
-	}
-
-	/**
-	 * Close a database
-	 * 
-	 * @param openDB
-	 *            db to be closed
-	 */
-	public static void close(Dispatch openDB) {
-		Dispatch.call(openDB, "Close");
-	}
-
-	/**
-	 * Extract the values from the recordset
-	 * 
-	 * @param recset
-	 * @return Variant that is the returned values
-	 */
-	public static Variant getValues(Dispatch recset) {
-		Dispatch.callSub(recset, "moveFirst");
-		Variant vi = new Variant(4096);
-		Variant v = Dispatch.call(recset, "GetRows", vi);
-		return v;
-	}
-
-	/**
-	 * should return ?? for the passed in ??
-	 * 
-	 * @param qd
-	 * @return Variant results of query?
-	 */
-	public static Variant getByQueryDef(Dispatch qd) {
-		// get a reference to the recordset
-		Dispatch recset = Dispatch.call(qd, "OpenRecordset").toDispatch();
-		// get the values as a safe array
-		String[] cols = getColumns(recset);
-		for (int i = 0; i < cols.length; i++) {
-			System.out.print(cols[i] + " ");
-		}
-		System.out.println("");
-		Variant vals = getValues(recset);
-		return vals;
-	}
-
-	/**
-	 * gets the columns form the rec set
-	 * 
-	 * @param recset
-	 * @return list of column names
-	 */
-	public static String[] getColumns(Dispatch recset) {
-		Dispatch flds = Dispatch.get(recset, "Fields").toDispatch();
-		int n_flds = Dispatch.get(flds, "Count").getInt();
-		String[] s = new String[n_flds];
-		Variant vi = new Variant();
-		for (int i = 0; i < n_flds; i++) {
-			vi.putInt(i);
-			// must use the invoke method because this is a method call
-			// that wants to have a Dispatch.Get flag...
-			Dispatch fld = Dispatch.invoke(recset, "Fields", Dispatch.Get,
-					new Object[] { vi }, new int[1]).toDispatch();
-			Variant name = Dispatch.get(fld, "Name");
-			s[i] = name.toString();
-		}
-		return s;
-	}
-}

samples/com/jacob/samples/ado/Command.java

@@ -1,207 +0,0 @@
-package com.jacob.samples.ado;
-
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-/**
- * Custom dispatch object to make it easy for us to provide application specific
- * API.
- * 
- */
-public class Command extends Dispatch {
-	/**
-	 * standard constructor
-	 */
-	public Command() {
-		super("ADODB.Command");
-	}
-
-	/**
-	 * This constructor is used instead of a case operation to turn a Dispatch
-	 * object into a wider object - it must exist in every wrapper class whose
-	 * instances may be returned from method calls wrapped in VT_DISPATCH
-	 * Variants.
-	 * 
-	 * @param dispatchTarget
-	 */
-	public Command(Dispatch dispatchTarget) {
-		super(dispatchTarget);
-	}
-
-	/**
-	 * runs the "Properties" command
-	 * 
-	 * @return the properties
-	 */
-	public Variant getProperties() {
-		return Dispatch.get(this, "Properties");
-	}
-
-	/**
-	 * runs the "ActiveConnection" command
-	 * 
-	 * @return a Connection object
-	 */
-	public Connection getActiveConnection() {
-		return new Connection(Dispatch.get(this, "ActiveConnection")
-				.toDispatch());
-	}
-
-	/**
-	 * Sets the "ActiveConnection" object
-	 * 
-	 * @param ppvObject
-	 *            the new connection
-	 */
-	public void setActiveConnection(Connection ppvObject) {
-		Dispatch.put(this, "ActiveConnection", ppvObject);
-	}
-
-	/**
-	 * 
-	 * @return the results from "CommandText"
-	 */
-	public String getCommandText() {
-		return Dispatch.get(this, "CommandText").toString();
-	}
-
-	/**
-	 * 
-	 * @param pbstr
-	 *            the new "CommandText"
-	 */
-	public void setCommandText(String pbstr) {
-		Dispatch.put(this, "CommandText", pbstr);
-	}
-
-	/**
-	 * 
-	 * @return the results of "CommandTimeout"
-	 */
-	public int getCommandTimeout() {
-		return Dispatch.get(this, "CommandTimeout").getInt();
-	}
-
-	/**
-	 * 
-	 * @param plTimeout
-	 *            the new "CommandTimeout"
-	 */
-	public void setCommandTimeout(int plTimeout) {
-		Dispatch.put(this, "CommandTimeout", new Variant(plTimeout));
-	}
-
-	/**
-	 * 
-	 * @return results from "Prepared"
-	 */
-	public boolean getPrepared() {
-		return Dispatch.get(this, "Prepared").getBoolean();
-	}
-
-	/**
-	 * 
-	 * @param pfPrepared
-	 *            the new value for "Prepared"
-	 */
-	public void setPrepared(boolean pfPrepared) {
-		Dispatch.put(this, "Prepared", new Variant(pfPrepared));
-	}
-
-	/**
-	 * "Execute"s a command
-	 * 
-	 * @param RecordsAffected
-	 * @param Parameters
-	 * @param Options
-	 * @return
-	 */
-	public Recordset Execute(Variant RecordsAffected, Variant Parameters,
-			int Options) {
-		return (Recordset) Dispatch.call(this, "Execute", RecordsAffected,
-				Parameters, new Variant(Options)).toDispatch();
-	}
-
-	/**
-	 * "Execute"s a command
-	 * 
-	 * @return
-	 */
-	public Recordset Execute() {
-		Variant dummy = new Variant();
-		return new Recordset(Dispatch.call(this, "Execute", dummy).toDispatch());
-	}
-
-	/**
-	 * creates a parameter
-	 * 
-	 * @param Name
-	 * @param Type
-	 * @param Direction
-	 * @param Size
-	 * @param Value
-	 * @return
-	 */
-	public Variant CreateParameter(String Name, int Type, int Direction,
-			int Size, Variant Value) {
-		return Dispatch.call(this, "CreateParameter", Name, new Variant(Type),
-				new Variant(Direction), new Variant(Size), Value);
-	}
-
-	// need to wrap Parameters
-	/**
-	 * @return "Parameters"
-	 */
-	public Variant getParameters() {
-		return Dispatch.get(this, "Parameters");
-	}
-
-	/**
-	 * 
-	 * @param plCmdType
-	 *            new "CommandType"
-	 */
-	public void setCommandType(int plCmdType) {
-		Dispatch.put(this, "CommandType", new Variant(plCmdType));
-	}
-
-	/**
-	 * 
-	 * @return current "CommandType"
-	 */
-	public int getCommandType() {
-		return Dispatch.get(this, "CommandType").getInt();
-	}
-
-	/**
-	 * 
-	 * @return "Name"
-	 */
-	public String getName() {
-		return Dispatch.get(this, "Name").toString();
-	}
-
-	/**
-	 * 
-	 * @param pbstrName
-	 *            new "Name"
-	 */
-	public void setName(String pbstrName) {
-		Dispatch.put(this, "Name", pbstrName);
-	}
-
-	/**
-	 * 
-	 * @return curent "State"
-	 */
-	public int getState() {
-		return Dispatch.get(this, "State").getInt();
-	}
-
-	/**
-	 * cancel whatever it is we're doing
-	 */
-	public void Cancel() {
-		Dispatch.call(this, "Cancel");
-	}
-}

samples/com/jacob/samples/ado/CommandTypeEnum.java

@@ -1,13 +0,0 @@
-package com.jacob.samples.ado;
-
-// Enum: CommandTypeEnum
-
-public interface CommandTypeEnum {
-	public static final int adCmdUnspecified = -1;
-	public static final int adCmdUnknown = 8;
-	public static final int adCmdText = 1;
-	public static final int adCmdTable = 2;
-	public static final int adCmdStoredProc = 4;
-	public static final int adCmdFile = 256;
-	public static final int adCmdTableDirect = 512;
-}

samples/com/jacob/samples/ado/Connection.java

@@ -1,151 +0,0 @@
-package com.jacob.samples.ado;
-
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-public class Connection extends Dispatch {
-	public Connection() {
-		super("ADODB.Connection");
-	}
-
-	/**
-	 * This constructor is used instead of a case operation to turn a Dispatch
-	 * object into a wider object - it must exist in every wrapper class whose
-	 * instances may be returned from method calls wrapped in VT_DISPATCH
-	 * Variants.
-	 */
-	public Connection(Dispatch d) {
-		super(d);
-	}
-
-	// need to wrap Properties
-	public Variant getProperties() {
-		return Dispatch.get(this, "Properties");
-	}
-
-	public String getConnectionString() {
-		return Dispatch.get(this, "ConnectionString").toString();
-	}
-
-	public void setConnectionString(String pbstr) {
-		Dispatch.put(this, "ConnectionString", pbstr);
-	}
-
-	public int getCommandTimeout() {
-		return Dispatch.get(this, "CommandTimeout").getInt();
-	}
-
-	public void setCommandTimeout(int plTimeout) {
-		Dispatch.put(this, "CommandTimeout", new Variant(plTimeout));
-	}
-
-	public int getConnectionTimeout() {
-		return Dispatch.get(this, "ConnectionTimeout").getInt();
-	}
-
-	public void setConnectionTimeout(int plTimeout) {
-		Dispatch.put(this, "ConnectionTimeout", new Variant(plTimeout));
-	}
-
-	public String getVersion() {
-		return Dispatch.get(this, "Version").toString();
-	}
-
-	public void Close() {
-		Dispatch.call(this, "Close");
-	}
-
-	// how to deal with RecordsAffected being output?
-	public Variant Execute(String CommandText, Variant RecordsAffected,
-			int Options) {
-		return Dispatch.call(this, CommandText, RecordsAffected, new Variant(
-				Options));
-	}
-
-	public int BeginTrans() {
-		return Dispatch.call(this, "BeginTrans").getInt();
-	}
-
-	public void CommitTrans() {
-		Dispatch.call(this, "CommitTrans");
-	}
-
-	public void RollbackTrans() {
-		Dispatch.call(this, "RollbackTrans");
-	}
-
-	public void Open(String ConnectionString, String UserID, String Password,
-			int Options) {
-		Dispatch.call(this, "Open", ConnectionString, UserID, Password,
-				new Variant(Options));
-	}
-
-	public void Open() {
-		Dispatch.call(this, "Open");
-	}
-
-	public Variant getErrors() {
-		return Dispatch.get(this, "Errors");
-	}
-
-	public String getDefaultDatabase() {
-		return Dispatch.get(this, "DefaultDatabase").toString();
-	}
-
-	public void setDefaultDatabase(String pbstr) {
-		Dispatch.put(this, "DefaultDatabase", pbstr);
-	}
-
-	public int getIsolationLevel() {
-		return Dispatch.get(this, "IsolationLevel").getInt();
-	}
-
-	public void setIsolationLevel(int Level) {
-		Dispatch.put(this, "IsolationLevel", new Variant(Level));
-	}
-
-	public int getAttributes() {
-		return Dispatch.get(this, "Attributes").getInt();
-	}
-
-	public void setAttributes(int plAttr) {
-		Dispatch.put(this, "Attributes", new Variant(plAttr));
-	}
-
-	public int getCursorLocation() {
-		return Dispatch.get(this, "CursorLocation").getInt();
-	}
-
-	public void setCursorLocation(int plCursorLoc) {
-		Dispatch.put(this, "CursorLocation", new Variant(plCursorLoc));
-	}
-
-	public int getMode() {
-		return Dispatch.get(this, "Mode").getInt();
-	}
-
-	public void setMode(int plMode) {
-		Dispatch.put(this, "Mode", new Variant(plMode));
-	}
-
-	public String getProvider() {
-		return Dispatch.get(this, "Provider").toString();
-	}
-
-	public void setProvider(String pbstr) {
-		Dispatch.put(this, "Provider", pbstr);
-	}
-
-	public int getState() {
-		return Dispatch.get(this, "State").getInt();
-	}
-
-	public Variant OpenSchema(int Schema, Variant Restrictions, Variant SchemaID) {
-		return Dispatch.call(this, "OpenSchema", new Variant(Schema),
-				Restrictions, SchemaID);
-	}
-
-	public void Cancel() {
-		Dispatch.call(this, "Cancel");
-	}
-}

samples/com/jacob/samples/ado/Field.java

@@ -1,101 +0,0 @@
-package com.jacob.samples.ado;
-
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-public class Field extends Dispatch {
-	/**
-	 * This constructor is used instead of a case operation to turn a Dispatch
-	 * object into a wider object - it must exist in every wrapper class whose
-	 * instances may be returned from method calls wrapped in VT_DISPATCH
-	 * Variants.
-	 */
-	public Field(Dispatch d) {
-		super(d);
-	}
-
-	public Variant getProperties() {
-		return Dispatch.get(this, "Properties");
-	}
-
-	public int getActualSize() {
-		return Dispatch.get(this, "ActualSize").getInt();
-	}
-
-	public int getAttributes() {
-		return Dispatch.get(this, "Attributes").getInt();
-	}
-
-	public int getDefinedSize() {
-		return Dispatch.get(this, "DefinedSize").getInt();
-	}
-
-	public String getName() {
-		return Dispatch.get(this, "Name").toString();
-	}
-
-	public int getType() {
-		return Dispatch.get(this, "Type").getInt();
-	}
-
-	public Variant getValue() {
-		return Dispatch.get(this, "Value");
-	}
-
-	public void setValue(Variant pvar) {
-		Dispatch.put(this, "Value", pvar);
-	}
-
-	public byte getPrecision() {
-		return Dispatch.get(this, "Precision").getByte();
-	}
-
-	public byte getNumericScale() {
-		return Dispatch.get(this, "NumericScale").getByte();
-	}
-
-	public void AppendChunk(Variant Data) {
-		Dispatch.call(this, "AppendChunk", Data);
-	}
-
-	public Variant GetChunk(int Length) {
-		return Dispatch.call(this, "GetChunk", new Variant(Length));
-	}
-
-	public Variant getOriginalValue() {
-		return Dispatch.get(this, "OriginalValue");
-	}
-
-	public Variant getUnderlyingValue() {
-		return Dispatch.get(this, "UnderlyingValue");
-	}
-
-	public Variant getDataFormat() {
-		return Dispatch.get(this, "DataFormat");
-	}
-
-	public void setDataFormat(Variant ppiDF) {
-		Dispatch.put(this, "DataFormat", ppiDF);
-	}
-
-	public void setPrecision(byte pb) {
-		Dispatch.put(this, "Precision", new Variant(pb));
-	}
-
-	public void setNumericScale(byte pb) {
-		Dispatch.put(this, "NumericScale", new Variant(pb));
-	}
-
-	public void setType(int pDataType) {
-		Dispatch.put(this, "Type", new Variant(pDataType));
-	}
-
-	public void setDefinedSize(int pl) {
-		Dispatch.put(this, "DefinedSize", new Variant(pl));
-	}
-
-	public void setAttributes(int pl) {
-		Dispatch.put(this, "Attributes", new Variant(pl));
-	}
-
-}

samples/com/jacob/samples/ado/Fields.java

@@ -1,43 +0,0 @@
-package com.jacob.samples.ado;
-
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-public class Fields extends Dispatch {
-	/**
-	 * This constructor is used instead of a case operation to turn a Dispatch
-	 * object into a wider object - it must exist in every wrapper class whose
-	 * instances may be returned from method calls wrapped in VT_DISPATCH
-	 * Variants.
-	 */
-	public Fields(Dispatch d) {
-		super(d);
-	}
-
-	public int getCount() {
-		return Dispatch.get(this, "Count").getInt();
-	}
-
-	public Variant _NewEnum() {
-		return Dispatch.call(this, "_NewEnum");
-	}
-
-	public void Refresh() {
-		Dispatch.call(this, "Refresh");
-	}
-
-	public Field getItem(int Index) {
-		return new Field(Dispatch.call(this, "Item", new Variant(Index))
-				.toDispatch());
-	}
-
-	public void Append(String Name, int Type, int DefinedSize, int Attrib) {
-		Dispatch.call(this, "Append", Name, new Variant(Type), new Variant(
-				DefinedSize), new Variant(Attrib));
-	}
-
-	public void Delete(Variant Index) {
-		Dispatch.call(this, "Delete", Index);
-	}
-
-}

samples/com/jacob/samples/ado/Recordset.java

@@ -1,342 +0,0 @@
-package com.jacob.samples.ado;
-
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-public class Recordset extends Dispatch {
-	public Recordset() {
-		super("ADODB.Recordset");
-	}
-
-	/**
-	 * This constructor is used instead of a case operation to turn a Dispatch
-	 * object into a wider object - it must exist in every wrapper class whose
-	 * instances may be returned from method calls wrapped in VT_DISPATCH
-	 * Variants.
-	 */
-	public Recordset(Dispatch d) {
-		super(d);
-	}
-
-	public Variant getProperties() {
-		return Dispatch.get(this, "Properties");
-	}
-
-	public int getAbsolutePosition() {
-		return Dispatch.get(this, "AbsolutePosition").getInt();
-	}
-
-	public void setAbsolutePosition(int pl) {
-		Dispatch.put(this, "AbsolutePosition", new Variant(pl));
-	}
-
-	public Connection getActiveConnection() {
-		return new Connection(Dispatch.get(this, "ActiveConnection")
-				.toDispatch());
-	}
-
-	public void setActiveConnection(Connection ppvObject) {
-		Dispatch.put(this, "ActiveConnection", ppvObject);
-	}
-
-	public void setActiveConnection(Variant ppvObject) {
-		Dispatch.put(this, "ActiveConnection", ppvObject);
-	}
-
-	public boolean getBOF() {
-		return Dispatch.get(this, "BOF").getBoolean();
-	}
-
-	public Variant getBookmark() {
-		return Dispatch.get(this, "Bookmark");
-	}
-
-	public void setBookmark(Variant pvBookmark) {
-		Dispatch.put(this, "Bookmark", pvBookmark);
-	}
-
-	public int getCacheSize() {
-		return Dispatch.get(this, "CacheSize").getInt();
-	}
-
-	public void setCacheSize(int pl) {
-		Dispatch.put(this, "CacheSize", new Variant(pl));
-	}
-
-	public int getCursorType() {
-		return Dispatch.get(this, "CursorType").getInt();
-	}
-
-	public void setCursorType(int pl) {
-		Dispatch.put(this, "CursorType", new Variant(pl));
-	}
-
-	public boolean getEOF() {
-		return Dispatch.get(this, "EOF").getBoolean();
-	}
-
-	public Fields getFields() {
-		return new Fields(Dispatch.get(this, "Fields").toDispatch());
-	}
-
-	public int getLockType() {
-		return Dispatch.get(this, "LockType").getInt();
-	}
-
-	public void setLockType(int plLockType) {
-		Dispatch.put(this, "LockType", new Variant(plLockType));
-	}
-
-	public int getMaxRecords() {
-		return Dispatch.get(this, "MaxRecords").getInt();
-	}
-
-	public void setMaxRecords(int pl) {
-		Dispatch.put(this, "MaxRecords", new Variant(pl));
-	}
-
-	public int getRecordCount() {
-		return Dispatch.get(this, "RecordCount").getInt();
-	}
-
-	public void setSource(Object pvSource) {
-		Dispatch.put(this, "Source", pvSource);
-	}
-
-	public void setSource(String pvSource) {
-		Dispatch.put(this, "Source", pvSource);
-	}
-
-	public Variant getSource() {
-		return Dispatch.get(this, "Source");
-	}
-
-	public void AddNew(Variant FieldList, Variant Values) {
-		Dispatch.call(this, "AddNew", FieldList, Values);
-	}
-
-	public void CancelUpdate() {
-		Dispatch.call(this, "CancelUpdate");
-	}
-
-	public void Close() {
-		Dispatch.call(this, "Close");
-	}
-
-	public void Delete(int AffectRecords) {
-		Dispatch.call(this, "Delete", new Variant(AffectRecords));
-	}
-
-	public Variant GetRows(int Rows, Variant Start, Variant Fields) {
-		return Dispatch.call(this, "GetRows", new Variant(Rows), Start, Fields);
-	}
-
-	// get all rows
-	public Variant GetRows() {
-		return Dispatch.call(this, "GetRows");
-	}
-
-	public void Move(int NumRecords, Variant Start) {
-		Dispatch.call(this, "Move", new Variant(NumRecords), Start);
-	}
-
-	public void MoveNext() {
-		Dispatch.call(this, "MoveNext");
-	}
-
-	public void MovePrevious() {
-		Dispatch.call(this, "MovePrevious");
-	}
-
-	public void MoveFirst() {
-		Dispatch.call(this, "MoveFirst");
-	}
-
-	public void MoveLast() {
-		Dispatch.call(this, "MoveLast");
-	}
-
-	public void Open(Variant Source, Variant ActiveConnection, int CursorType,
-			int LockType, int Options) {
-		Dispatch.call(this, "Open", Source, ActiveConnection, new Variant(
-				CursorType), new Variant(LockType), new Variant(Options));
-	}
-
-	public void Open(Variant Source, Variant ActiveConnection) {
-		Dispatch.call(this, "Open", Source, ActiveConnection);
-	}
-
-	public void Requery(int Options) {
-		Dispatch.call(this, "Requery", new Variant(Options));
-	}
-
-	public void Update(Variant Fields, Variant Values) {
-		Dispatch.call(this, "Update", Fields, Values);
-	}
-
-	public int getAbsolutePage() {
-		return Dispatch.get(this, "AbsolutePage").getInt();
-	}
-
-	public void setAbsolutePage(int pl) {
-		Dispatch.put(this, "AbsolutePage", new Variant(pl));
-	}
-
-	public int getEditMode() {
-		return Dispatch.get(this, "EditMode").getInt();
-	}
-
-	public Variant getFilter() {
-		return Dispatch.get(this, "Filter");
-	}
-
-	public void setFilter(Variant Criteria) {
-		Dispatch.put(this, "Filter", Criteria);
-	}
-
-	public int getPageCount() {
-		return Dispatch.get(this, "PageCount").getInt();
-	}
-
-	public int getPageSize() {
-		return Dispatch.get(this, "PageSize").getInt();
-	}
-
-	public void setPageSize(int pl) {
-		Dispatch.put(this, "PageSize", new Variant(pl));
-	}
-
-	public String getSort() {
-		return Dispatch.get(this, "Sort").toString();
-	}
-
-	public void setSort(String Criteria) {
-		Dispatch.put(this, "Sort", Criteria);
-	}
-
-	public int getStatus() {
-		return Dispatch.get(this, "Status").getInt();
-	}
-
-	public int getState() {
-		return Dispatch.get(this, "State").getInt();
-	}
-
-	public void UpdateBatch(int AffectRecords) {
-		Dispatch.call(this, "UpdateBatch", new Variant(AffectRecords));
-	}
-
-	public void CancelBatch(int AffectRecords) {
-		Dispatch.call(this, "CancelBatch", new Variant(AffectRecords));
-	}
-
-	public int getCursorLocation() {
-		return Dispatch.get(this, "CursorLocation").getInt();
-	}
-
-	public void setCursorLocation(int pl) {
-		Dispatch.put(this, "CursorLocation", new Variant(pl));
-	}
-
-	public Recordset NextRecordset(Variant RecordsAffected) {
-		return new Recordset(Dispatch.call(this, "NextRecordset",
-				RecordsAffected).toDispatch());
-	}
-
-	public boolean Supports(int CursorOptions) {
-		return Dispatch.call(this, "Supports", new Variant(CursorOptions))
-				.getBoolean();
-	}
-
-	public Variant getCollect(Variant Index) {
-		return Dispatch.get(this, "Collect");
-	}
-
-	public void setCollect(Variant Index, Variant pvar) {
-		Dispatch.call(this, "Collect", Index, pvar);
-	}
-
-	public int getMarshalOptions() {
-		return Dispatch.get(this, "MarshalOptions").getInt();
-	}
-
-	public void setMarshalOptions(int pl) {
-		Dispatch.put(this, "MarshalOptions", new Variant(pl));
-	}
-
-	public void Find(String Criteria, int SkipRecords, int SearchDirection,
-			Variant Start) {
-		Dispatch.call(this, "Find", Criteria, new Variant(SkipRecords),
-				new Variant(SearchDirection), Start);
-	}
-
-	public void Cancel() {
-		Dispatch.call(this, "Cancel");
-	}
-
-	public Variant getDataSource() {
-		return Dispatch.get(this, "DataSource");
-	}
-
-	public void setDataSource(Variant ppunkDataSource) {
-		Dispatch.put(this, "DataSource", ppunkDataSource);
-	}
-
-	public void Save(String FileName, int PersistFormat) {
-		Dispatch.call(this, "Save", FileName, new Variant(PersistFormat));
-	}
-
-	public Variant getActiveCommand() {
-		return Dispatch.get(this, "ActiveCommand");
-	}
-
-	public void setStayInSync(boolean pb) {
-		Dispatch.put(this, "StayInSync", new Variant(pb));
-	}
-
-	public boolean getStayInSync() {
-		return Dispatch.get(this, "StayInSync").getBoolean();
-	}
-
-	public String GetString(int StringFormat, int NumRows,
-			String ColumnDelimeter, String RowDelimeter, String NullExpr) {
-		return Dispatch.call(this, "GetString", new Variant(StringFormat),
-				new Variant(NumRows), ColumnDelimeter, RowDelimeter, NullExpr)
-				.toString();
-	}
-
-	public String getDataMember() {
-		return Dispatch.get(this, "DataMember").toString();
-	}
-
-	public void setDataMember(String pl) {
-		Dispatch.put(this, "DataMember", new Variant(pl));
-	}
-
-	public int CompareBookmarks(Variant Bookmark1, Variant Bookmark2) {
-		return Dispatch.call(this, "CompareBookmarks", Bookmark1, Bookmark2)
-				.getInt();
-	}
-
-	public Recordset Clone(int LockType) {
-		return new Recordset(Dispatch
-				.call(this, "Clone", new Variant(LockType)).toDispatch());
-	}
-
-	public void Resync(int AffectRecords, int ResyncValues) {
-		Dispatch.call(this, "Resync", new Variant(AffectRecords), new Variant(
-				ResyncValues));
-	}
-
-	public void Seek(Variant KeyValues, int SeekOption) {
-		Dispatch.call(this, "Seek", KeyValues, new Variant(SeekOption));
-	}
-
-	public void setIndex(String pl) {
-		Dispatch.put(this, "Index", new Variant(pl));
-	}
-
-	public String getIndex() {
-		return Dispatch.get(this, "Index)").toString();
-	}
-}

samples/com/jacob/samples/ado/test.java

@@ -1,56 +0,0 @@
-package com.jacob.samples.ado;
-
-import com.jacob.com.Variant;
-
-public class test {
-	public static void printRS(Recordset rs) {
-		Fields fs = rs.getFields();
-
-		for (int i = 0; i < fs.getCount(); i++) {
-			System.out.print(fs.getItem(i).getName() + " ");
-		}
-		System.out.println("");
-
-		rs.MoveFirst();
-		while (!rs.getEOF()) {
-			for (int i = 0; i < fs.getCount(); i++) {
-				Field f = fs.getItem(i);
-				Variant v = f.getValue();
-				System.out.print(v + " ");
-			}
-			System.out.println("");
-			rs.MoveNext();
-		}
-	}
-
-	// open a recordset directly
-	public static void getRS(String con, String query) {
-		System.out.println("Recordset Open");
-		Recordset rs = new Recordset();
-		rs.Open(new Variant(query), new Variant(con));
-		printRS(rs);
-	}
-
-	// create connection and command objects and use them
-	// to get a recordset
-	public static void getCommand(String con, String query) {
-		System.out.println("Command+Connection -> Recordset");
-		Connection c = new Connection();
-		c.setConnectionString(con);
-		c.Open();
-		Command comm = new Command();
-		comm.setActiveConnection(c);
-		comm.setCommandType(CommandTypeEnum.adCmdText);
-		comm.setCommandText(query);
-		Recordset rs = comm.Execute();
-		printRS(rs);
-		c.Close();
-	}
-
-	public static void main(String[] args) {
-		String connectStr = "DRIVER=SQL Server;SERVER=DANADLER;UID=sa;PWD=;WSID=DANADLER;DATABASE=pubs";
-		String queryStr = "select * from authors";
-		getCommand(connectStr, queryStr);
-		getRS(connectStr, queryStr);
-	}
-}

samples/com/jacob/samples/applet/JacobTestApplet.java

@@ -1,88 +0,0 @@
-package com.jacob.samples.applet;
-
-import java.applet.Applet;
-import java.awt.Button;
-import java.awt.FlowLayout;
-import java.awt.TextField;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-/**
- * Example applet to demonstrate:
- * 1. The use of jacob from an applet
- * 2. To show how to distribute the jacob native lib with the applet (also works with webstart)
- * 
- * Comment on 2.:
- * The way shown here is quite straight forward and it is not necessary to use 
- * a mechanism like the "DLLFromJARClassLoader" or something similar...
- * 
- *  @author ttreeck, www.nepatec.de
- * 
- */
-
-public class JacobTestApplet extends Applet implements ActionListener {
-
-	private static final long serialVersionUID = 4492492907986849158L;
-
-	TextField in;
-	TextField out;
-	Button calc;
-	ActiveXComponent sC = null;
-
-	/**
-	 * startup method
-	 */
-	@Override
-	public void init() {
-		setLayout(new FlowLayout());
-		add(this.in = new TextField("1+1", 16));
-		add(this.out = new TextField("?", 16));
-		add(this.calc = new Button("Calculate"));
-		this.calc.addActionListener(this);
-
-	}
-
-	/**
-	 * Returns information about this applet. 
-	 * According to the java spec:
-	 * "An applet should override this method to return a String containing information about the author, version, and copyright of the applet." 
-	 * 
-	 * @return information about the applet. 
-	 */
-	@Override
-	public String getAppletInfo() {
-		return "Jacob Test Applet. Written by ttreeck, nepatec GmbH & Co. KG.\nhttp://www.nepatec.de";
-	}
-	
-	/**
-	 * Returns information about the parameters that are understood by this applet.
-	 * According to the java spec:
-	 * "An applet should override this method to return an array of Strings describing these parameters."
-	 * 
-	 * @return array with a set of three Strings containing the name, the type, and a description. 
-	 */
-
-	@Override
-	public String[][] getParameterInfo(){
-        return new String[][]{};
-	}
-
-	/**
-	 * action method that receives button actions
-	 * 
-	 * @param ev the event
-	 */
-	public void actionPerformed(ActionEvent ev) {
-		if (this.sC == null) {
-			String lang = "VBScript";
-			this.sC = new ActiveXComponent("ScriptControl");
-			Dispatch.put(this.sC, "Language", lang);
-		}
-		Variant v = Dispatch.call(this.sC, "Eval", this.in.getText());
-		this.out.setText(v.toString());
-	}
-}

samples/com/jacob/samples/atl/MultiFace/Face.cpp

@@ -1,67 +0,0 @@
-// Face.cpp : Implementation of CMultiFaceApp and DLL registration.
-
-#include "stdafx.h"
-#include "MultiFace.h"
-#include "Face.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-
-STDMETHODIMP Face::InterfaceSupportsErrorInfo(REFIID riid)
-{
-	static const IID* arr[] = 
-	{
-		&IID_IFace1,
-		&IID_IFace2,
-		&IID_IFace3,
-	};
-
-	for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
-	{
-		if (InlineIsEqualGUID(*arr[i],riid))
-			return S_OK;
-	}
-	return S_FALSE;
-}
-
-STDMETHODIMP Face::get_Face1Name(BSTR *pVal)
-{
-	// TODO: Add your implementation code here
-	*pVal = name1;
-	return S_OK;
-}
-
-STDMETHODIMP Face::put_Face1Name(BSTR newVal)
-{
-	// TODO: Add your implementation code here
-	name1 = newVal;
-	return S_OK;
-}
-
-STDMETHODIMP Face::get_Face2Nam(BSTR *pVal)
-{
-	// TODO: Add your implementation code here
-	*pVal = name2;
-	return S_OK;
-}
-
-STDMETHODIMP Face::put_Face2Nam(BSTR newVal)
-{
-	// TODO: Add your implementation code here
-	name2 = newVal;
-	return S_OK;
-}
-
-STDMETHODIMP Face::get_Face3Name(BSTR *pVal)
-{
-	// TODO: Add your implementation code here
-	*pVal = name3;
-	return S_OK;
-}
-
-STDMETHODIMP Face::put_Face3Name(BSTR newVal)
-{
-	// TODO: Add your implementation code here
-	name3 = newVal;
-	return S_OK;
-}

samples/com/jacob/samples/atl/MultiFace/Face.h

@@ -1,63 +0,0 @@
-// Face.h: Definition of the Face class
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_FACE_H__9BF24413_B2E0_11D4_A695_00104BFF3241__INCLUDED_)
-#define AFX_FACE_H__9BF24413_B2E0_11D4_A695_00104BFF3241__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include "resource.h"       // main symbols
-
-/////////////////////////////////////////////////////////////////////////////
-// Face
-
-class Face : 
-	public IDispatchImpl<IFace1, &IID_IFace1, &LIBID_MULTIFACELib>, 
-	public IDispatchImpl<IFace2, &IID_IFace2, &LIBID_MULTIFACELib>, 
-	public IDispatchImpl<IFace3, &IID_IFace3, &LIBID_MULTIFACELib>, 
-	public ISupportErrorInfo,
-	public CComObjectRoot,
-	public CComCoClass<Face,&CLSID_Face>
-{
-// IFace1
-private:
-    CComBSTR name1;
-
-// IFace2
-	CComBSTR name2;
-
-// IFace3
-	CComBSTR name3;
-
-public:
-	Face() {}
-BEGIN_COM_MAP(Face)
-	COM_INTERFACE_ENTRY2(IDispatch, IFace1)
-	COM_INTERFACE_ENTRY(IFace1)
-	COM_INTERFACE_ENTRY(IFace2)
-	COM_INTERFACE_ENTRY(IFace3)
-	COM_INTERFACE_ENTRY(ISupportErrorInfo)
-END_COM_MAP()
-//DECLARE_NOT_AGGREGATABLE(Face) 
-// Remove the comment from the line above if you don't want your object to 
-// support aggregation. 
-
-DECLARE_REGISTRY_RESOURCEID(IDR_Face)
-// ISupportsErrorInfo
-	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
-
-
-
-public:
-	STDMETHOD(get_Face3Name)(/*[out, retval]*/ BSTR *pVal);
-	STDMETHOD(put_Face3Name)(/*[in]*/ BSTR newVal);
-	STDMETHOD(get_Face2Nam)(/*[out, retval]*/ BSTR *pVal);
-	STDMETHOD(put_Face2Nam)(/*[in]*/ BSTR newVal);
-	STDMETHOD(get_Face1Name)(/*[out, retval]*/ BSTR *pVal);
-	STDMETHOD(put_Face1Name)(/*[in]*/ BSTR newVal);
-};
-
-#endif // !defined(AFX_FACE_H__9BF24413_B2E0_11D4_A695_00104BFF3241__INCLUDED_)

samples/com/jacob/samples/atl/MultiFaceTest.java

@@ -1,46 +0,0 @@
-package com.jacob.samples.atl;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-class MultiFaceTest {
-
-	/**
-	 * standard main() test program
-	 * 
-	 * @param args
-	 *            the command line arguments
-	 */
-	public static void main(String[] args) {
-		// this method has been deprecated as being unreliable.
-		// shutdown should be done through other means
-		// whoever wrote this example should explain what this was intended to
-		// do
-		// System.runFinalizersOnExit(true);
-
-		ActiveXComponent mf = new ActiveXComponent("MultiFace.Face");
-		try {
-			// I am now dealing with the default interface (IFace1)
-			Dispatch.put(mf, "Face1Name", new Variant("Hello Face1"));
-			System.out.println(Dispatch.get(mf, "Face1Name"));
-
-			// get to IFace2 through the IID
-			Dispatch f2 = mf
-					.QueryInterface("{9BF24410-B2E0-11D4-A695-00104BFF3241}");
-			// I am now dealing with IFace2
-			Dispatch.put(f2, "Face2Nam", new Variant("Hello Face2"));
-			System.out.println(Dispatch.get(f2, "Face2Nam"));
-
-			// get to IFace3 through the IID
-			Dispatch f3 = mf
-					.QueryInterface("{9BF24411-B2E0-11D4-A695-00104BFF3241}");
-			// I am now dealing with IFace3
-			Dispatch.put(f3, "Face3Name", new Variant("Hello Face3"));
-			System.out.println(Dispatch.get(f3, "Face3Name"));
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}

samples/com/jacob/samples/office/ExcelDispatchTest.java

@@ -1,52 +0,0 @@
-package com.jacob.samples.office;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.ComThread;
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-/**
- * Sample test program snagged out of a question on the sun discussion area.
- * <p>
- * May need to run with some command line options (including from inside
- * Eclipse). Look in the docs area at the Jacob usage document for command line
- * options.
- */
-public class ExcelDispatchTest {
-
-	/**
-	 * main run loop for test program
-	 * 
-	 * @param args
-	 *            standard command line arguments
-	 */
-	public static void main(String[] args) {
-		ComThread.InitSTA();
-
-		ActiveXComponent xl = new ActiveXComponent("Excel.Application");
-		try {
-			System.out.println("version=" + xl.getProperty("Version"));
-			System.out.println("version=" + Dispatch.get(xl, "Version"));
-			Dispatch.put(xl, "Visible", new Variant(true));
-			Dispatch workbooks = xl.getProperty("Workbooks").toDispatch();
-			Dispatch workbook = Dispatch.get(workbooks, "Add").toDispatch();
-			Dispatch sheet = Dispatch.get(workbook, "ActiveSheet").toDispatch();
-			Dispatch a1 = Dispatch.invoke(sheet, "Range", Dispatch.Get,
-					new Object[] { "A1" }, new int[1]).toDispatch();
-			Dispatch a2 = Dispatch.invoke(sheet, "Range", Dispatch.Get,
-					new Object[] { "A2" }, new int[1]).toDispatch();
-			Dispatch.put(a1, "Value", "123.456");
-			Dispatch.put(a2, "Formula", "=A1*2");
-			System.out.println("a1 from excel:" + Dispatch.get(a1, "Value"));
-			System.out.println("a2 from excel:" + Dispatch.get(a2, "Value"));
-			Variant f = new Variant(false);
-			Dispatch.call(workbook, "Close", f);
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			xl.invoke("Quit", new Variant[] {});
-			ComThread.Release();
-		}
-	}
-
-}

samples/com/jacob/samples/office/VisioPrintTest.java

@@ -1,48 +0,0 @@
-package com.jacob.samples.office;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.ComFailException;
-import com.jacob.com.Dispatch;
-
-/**
- * Snippet to show Visio print dialog
- * <p>
- * Sample submitted by fatbuttlarry in SourceForge 1803140 as part of bug report
- * <p>
- * Tested with Java 6.0SE and MS Office 2003 ** Note: 1010 = VB's
- * visCmdFilePrint constant
- */
-public class VisioPrintTest {
-
-	/**
-	 * Runs the print ant lets the user say ok or cancel. Note the funky Visio
-	 * behavior if someone hits the cancel button
-	 * 
-	 */
-	public void testPrintDialog() {
-		ActiveXComponent oActiveX = new ActiveXComponent("Visio.Application");
-		Dispatch oDocuments = oActiveX.getProperty("Documents").toDispatch();
-		// create a blank document
-		Dispatch.call(oDocuments, "Add", "");
-		try {
-			Dispatch.call(oActiveX, "DoCmd", new Integer(1010)).getInt();
-			System.out.println("User hit the ok button.");
-		} catch (ComFailException e) {
-			System.out.println("User hit the cancel button: " + e);
-		} finally {
-			oActiveX.invoke("Quit");
-		}
-		return;
-	}
-
-	/**
-	 * quick main() to test this
-	 * 
-	 * @param args
-	 *            standard command line arguments
-	 */
-	public static void main(String[] args) {
-		VisioPrintTest testObject = new VisioPrintTest();
-		testObject.testPrintDialog();
-	}
-}

samples/com/jacob/samples/office/WordDocumentProperties.java

@@ -1,171 +0,0 @@
-package com.jacob.samples.office;
-
-import java.io.File;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.ComException;
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-/**
- * Submitted to the Jacob SourceForge web site as a sample 3/2005
- * <p>
- * This sample is BROKEN because it doesn't call quit!
- * 
- * @author Date Created Description Jason Twist 04 Mar 2005 Code opens a locally
- *         stored Word document and extracts the Built In properties and Custom
- *         properties from it. This code just gives an intro to JACOB and there
- *         are sections that could be enhanced
- */
-public class WordDocumentProperties {
-	// Declare word object
-	private ActiveXComponent objWord;
-
-	// Declare Word Properties
-	private Dispatch custDocprops;
-
-	private Dispatch builtInDocProps;
-
-	// the doucments object is important in any real app but this demo doesn't
-	// use it
-	// private Dispatch documents;
-
-	private Dispatch document;
-
-	private Dispatch wordObject;
-
-	/**
-	 * Empty Constructor
-	 * 
-	 */
-	public WordDocumentProperties() {
-	}
-
-	/**
-	 * Opens a document
-	 * 
-	 * @param filename
-	 */
-	public void open(String filename) {
-		// Instantiate objWord
-		objWord = new ActiveXComponent("Word.Application");
-
-		// Assign a local word object
-		wordObject = objWord.getObject();
-
-		// Create a Dispatch Parameter to hide the document that is opened
-		Dispatch.put(wordObject, "Visible", new Variant(false));
-
-		// Instantiate the Documents Property
-		Dispatch documents = objWord.getProperty("Documents").toDispatch();
-
-		// Open a word document, Current Active Document
-		document = Dispatch.call(documents, "Open", filename).toDispatch();
-	}
-
-	/**
-	 * Creates an instance of the VBA CustomDocumentProperties property
-	 * 
-	 */
-	public void selectCustomDocumentProperitiesMode() {
-		// Create CustomDocumentProperties and BuiltInDocumentProperties
-		// properties
-		custDocprops = Dispatch.get(document, "CustomDocumentProperties")
-				.toDispatch();
-	}
-
-	/**
-	 * Creates an instance of the VBA BuiltInDocumentProperties property
-	 * 
-	 */
-	public void selectBuiltinPropertiesMode() {
-		// Create CustomDocumentProperties and BuiltInDocumentProperties
-		// properties
-		builtInDocProps = Dispatch.get(document, "BuiltInDocumentProperties")
-				.toDispatch();
-	}
-
-	/**
-	 * Closes a document
-	 * 
-	 */
-	public void close() {
-		// Close object
-		Dispatch.call(document, "Close");
-	}
-
-	/**
-	 * Custom Property Name is passed in
-	 * 
-	 * @param cusPropName
-	 * @return String - Custom property value
-	 */
-	public String getCustomProperty(String cusPropName) {
-		try {
-			cusPropName = Dispatch.call(custDocprops, "Item", cusPropName)
-					.toString();
-		} catch (ComException e) {
-			// Do nothing
-			cusPropName = null;
-		}
-
-		return cusPropName;
-	}
-
-	/**
-	 * Built In Property Name is passed in
-	 * 
-	 * @param builtInPropName
-	 * @return String - Built in property value
-	 */
-	public String getBuiltInProperty(String builtInPropName) {
-		try {
-			builtInPropName = Dispatch.call(builtInDocProps, "Item",
-					builtInPropName).toString();
-		} catch (ComException e) {
-			// Do nothing
-			builtInPropName = null;
-		}
-
-		return builtInPropName;
-	}
-
-	/**
-	 * simple main program that gets some properties and prints them out
-	 * 
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		try {
-			// Instantiate the class
-			WordDocumentProperties jacTest = new WordDocumentProperties();
-
-			// Open the word doc
-			File doc = new File(
-					"samples/com/jacob/samples/office/TestDocument.doc");
-			jacTest.open(doc.getAbsolutePath());
-
-			// Set Custom Properties
-			jacTest.selectCustomDocumentProperitiesMode();
-
-			// Set Built In Properties
-			jacTest.selectBuiltinPropertiesMode();
-
-			// Get custom Property Value
-			String custValue = jacTest.getCustomProperty("Information Source");
-
-			// Get built in prroperty Property Value
-			String builtInValue = jacTest.getBuiltInProperty("Author");
-
-			// Close Word Doc
-			jacTest.close();
-
-			// Output data
-			System.out.println("Document Val One: " + custValue);
-			System.out.println("Document Author: " + builtInValue);
-
-		} catch (Exception e) {
-			System.out.println(e);
-		}
-	}
-}

samples/com/jacob/samples/outlook/Outlook.java

@@ -1,80 +0,0 @@
-package com.jacob.samples.outlook;
-
-/**
- * JACOB Outlook sample contributed by
- * Christopher Brind <christopher.brind@morse.com> 
- */
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-/**
- * sample class to show simple outlook manipulation
- */
-public class Outlook {
-
-	private static String pad(int i) {
-		StringBuffer sb = new StringBuffer();
-
-		while (sb.length() < i) {
-			sb.append(' ');
-		}
-
-		return sb.toString();
-	}
-
-	private static void recurseFolders(int iIndent, Dispatch o) {
-
-		if (o == null) {
-			return;
-		}
-		Dispatch oFolders = Dispatch.get(o, "Folders").toDispatch();
-		// System.out.println("oFolders=" + oFolders);
-		if (oFolders == null) {
-			return;
-		}
-
-		Dispatch oFolder = Dispatch.get(oFolders, "GetFirst").toDispatch();
-		do {
-			Object oFolderName = Dispatch.get(oFolder, "Name");
-			if (null == oFolderName) {
-				break;
-			}
-
-			System.out.println(pad(iIndent) + oFolderName);
-			recurseFolders(iIndent + 3, oFolder);
-
-			oFolder = Dispatch.get(oFolders, "GetNext").toDispatch();
-		} while (true);
-
-	}
-
-	/**
-	 * standard run loop
-	 * 
-	 * @param asArgs
-	 *            command line arguments
-	 * @throws Exception
-	 */
-	public static void main(String asArgs[]) throws Exception {
-		System.out.println("Outlook: IN");
-
-		ActiveXComponent axOutlook = new ActiveXComponent("Outlook.Application");
-		try {
-			System.out.println("version=" + axOutlook.getProperty("Version"));
-
-			Dispatch oOutlook = axOutlook.getObject();
-			System.out.println("version=" + Dispatch.get(oOutlook, "Version"));
-
-			Dispatch oNameSpace = axOutlook.getProperty("Session").toDispatch();
-			System.out.println("oNameSpace=" + oNameSpace);
-
-			recurseFolders(0, oNameSpace);
-
-		} finally {
-			axOutlook.invoke("Quit", new Variant[] {});
-		}
-	}
-
-}

samples/com/jacob/samples/servlet/JacobScript.java_nocompile

@@ -1,75 +0,0 @@
-package com.jacob.samples.servlet;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-
-import com.jacob.com.*;
-import com.jacob.activeX.*;
-
-public class JacobScript extends javax.servlet.http.HttpServlet 
-{
-  public void doGet(HttpServletRequest req, 
-                    HttpServletResponse res) 
-      throws ServletException
-  {
-    PrintWriter out = null;
-    try
-    {
-      res.setContentType("text/html");
-      out = res.getWriter();
-      // display a form
-      out.println("<h1>Enter a VBScript Expression</h1>");
-      out.println("<form method=\"POST\" action=\"/JacobScript\">");
-      out.println("<input name=\"expr\" type=\"text\" width=64>");
-      out.println("<input type=\"submit\">");
-      out.println("</form>");
-    } catch (Exception e) {
-      e.printStackTrace();
-      out.println("<H2>Error:"+e+"</H2>");
-    }
-  }
-
-  public void doPost(HttpServletRequest req, 
-                    HttpServletResponse res) 
-      throws ServletException
-  {
-    PrintWriter out = null;
-
-    try 
-    {
-      res.setContentType("text/html");
-      out = res.getWriter();
-      // get what they typed in
-      String expr = (String)req.getParameter("expr");
-      // make sure we have a session
-      HttpSession session = req.getSession(true);
-      Dispatch sControl = null;
-      if (session.isNew()) 
-      {
-        // initialize the control and store it on the session
-        String lang = "VBScript";
-        ActiveXComponent sC = new ActiveXComponent("ScriptControl");
-        sControl = sC.getObject();
-        Dispatch.put(sControl, "Language", lang);
-        session.putValue("control", sControl);
-      }
-      else
-      {
-        sControl = (Dispatch)session.getValue("control");
-      }
-      Variant result = Dispatch.call(sControl, "Eval", expr);
-      // display a form
-      out.println("<h1>Enter a VBScript Expression</h1>");
-      out.println("<form method=\"POST\" action=\"/JacobScript\">");
-      out.println("<input name=\"expr\" type=\"text\" value=\""+expr+"\" width=64>");
-      out.println("<input type=\"submit\">");
-      out.println("</form>");
-      out.println("<H1>Jacob Response:</H1>");
-      out.println("<H2>"+result+"</H2>");
-    } catch (Exception e) {
-      e.printStackTrace();
-      out.println("<H2>Error:"+e+"</H2>");
-    }
-  }
-}

samples/com/jacob/samples/servlet/readme.txt

@@ -1,45 +0,0 @@
-This sample runs in Weblogic 5.1 as a servlet.
-
-0. Rename JacobScript.java_nocompile to JacobScript.java
-1. Compile this file (make sure you have jdk1.2 installed or the
-   javax.servlet.* classes in your classpath).
-2. Make sure the weblogic policy file allows native access. The easiest
-   way is to replace the contents with this:
-
-grant codeBase "file:d:/weblogic/-" {
-  permission java.security.AllPermission;
-};
-
-grant codeBase "file:/c:/classes/-" {
-  permission java.security.AllPermission;
-};
-
-
-grant codeBase "file:${java.home}/lib/ext/-" {
-  permission java.security.AllPermission;
-};
-
-grant { 
-  permission java.security.AllPermission;
-};
-
-3. Add the servlet to the weblogic.properties file:
-
-weblogic.httpd.register.JacobScript=JacobScript
-
-4. Either add your CLASSPATH to weblogic.classpath in startWebLogic.cmd
-   or copy the com directory into weblogic/myserver/servletclasses
-
-5. Copy the jacob/samples/servlet/* into weblogic/myserver/servletclasses
-6. Start weblogic
-
-7. Type the url: http://localhost:7001/JacobScript into the browser
-   (If you run on port 7001)
-
-8. Enter a VBScript expression like:
-   1+2
-   Now
-   "hello" & " world"
-   etc.
-   and watch the MS Script control (which you must have installed)
-   evaluate and return the result.

samples/com/jacob/samples/system/DiskUtils.java

@@ -1,152 +0,0 @@
-package com.jacob.samples.system;
-
-import java.text.DecimalFormat;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.ComThread;
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-/**
- * Example VB script that grabs hard drive properties.
- * <p>
- * Source Forge posting
- * http://sourceforge.net/forum/forum.php?thread_id=1785936&forum_id=375946
- * <p>
- * Enhance by clay_shooter with info from
- * http://msdn2.microsoft.com/en-us/library/d6dw7aeh.aspx
- * 
- * @author qstephenson
- * 
- */
-public class DiskUtils {
-
-	/** formatters aren't thread safe but the sample only has one thread */
-	private static DecimalFormat sizeFormatter = new DecimalFormat(
-			"###,###,###,###");
-
-	/** a pointer to the scripting file system object */
-	private ActiveXComponent fileSystemApp = null;
-
-	/** the dispatch that points at the drive this DiskUtil operates against */
-	private Dispatch myDrive = null;
-
-	/**
-	 * Standard constructor
-	 * 
-	 * @param drive
-	 *            the drive to run the test against.
-	 */
-	public DiskUtils(String drive) {
-		setUp(drive);
-	}
-
-	/**
-	 * open the connection to the scripting object
-	 * 
-	 * @param drive
-	 *            the drive to run the test against
-	 */
-	public void setUp(String drive) {
-		if (fileSystemApp == null) {
-			ComThread.InitSTA();
-			fileSystemApp = new ActiveXComponent("Scripting.FileSystemObject");
-			myDrive = Dispatch.call(fileSystemApp, "GetDrive", drive)
-					.toDispatch();
-		}
-	}
-
-	/**
-	 * Do any needed cleanup
-	 */
-	public void tearDown() {
-		ComThread.Release();
-	}
-
-	/**
-	 * convenience method
-	 * 
-	 * @return driver serial number
-	 */
-	public int getSerialNumber() {
-		return Dispatch.get(myDrive, "SerialNumber").getInt();
-	}
-
-	/**
-	 * Convenience method. We go through these formatting hoops so we can make
-	 * the size string pretty. We wouldn't have to do that if we didn't mind
-	 * long strings with Exxx at the end or the fact that the value returned can
-	 * vary in size based on the size of the disk.
-	 * 
-	 * @return driver total size of the disk
-	 */
-	public String getTotalSize() {
-		Variant returnValue = Dispatch.get(myDrive, "TotalSize");
-		if (returnValue.getvt() == Variant.VariantDouble) {
-			return sizeFormatter.format(returnValue.getDouble());
-		} else if (returnValue.getvt() == Variant.VariantInt) {
-			return sizeFormatter.format(returnValue.getInt());
-		} else {
-			return "Don't know type: " + returnValue.getvt();
-		}
-	}
-
-	/**
-	 * Convenience method. We wouldn't have to do that if we didn't mind long
-	 * strings with Exxx at the end or the fact that the value returned can vary
-	 * in size based on the size of the disk.
-	 * 
-	 * @return driver free size of the disk
-	 */
-	public String getFreeSpace() {
-		Variant returnValue = Dispatch.get(myDrive, "FreeSpace");
-		if (returnValue.getvt() == Variant.VariantDouble) {
-			return sizeFormatter.format(returnValue.getDouble());
-		} else if (returnValue.getvt() == Variant.VariantInt) {
-			return sizeFormatter.format(returnValue.getInt());
-		} else {
-			return "Don't know type: " + returnValue.getvt();
-		}
-	}
-
-	/**
-	 * 
-	 * @return file system on the drive
-	 */
-	public String getFileSystemType() {
-		// figure ot the actual variant type
-		// Variant returnValue = Dispatch.get(myDrive, "FileSystem");
-		// System.out.println(returnValue.getvt());
-		return Dispatch.get(myDrive, "FileSystem").getString();
-	}
-
-	/**
-	 * 
-	 * @return volume name
-	 */
-	public String getVolumeName() {
-		return Dispatch.get(myDrive, "VolumeName").getString();
-	}
-
-	/**
-	 * Simple main program that creates a DiskUtils object and queries for the
-	 * C: drive
-	 * 
-	 * @param args
-	 *            standard command line arguments
-	 */
-	public static void main(String[] args) {
-		// DiskUtils utilConnection = new DiskUtils("F");
-		DiskUtils utilConnection = new DiskUtils("C");
-		System.out.println("Disk serial number is: "
-				+ utilConnection.getSerialNumber());
-		System.out.println("FileSystem is: "
-				+ utilConnection.getFileSystemType());
-		System.out.println("Volume Name is: " + utilConnection.getVolumeName());
-		System.out.println("Disk total size is: "
-				+ utilConnection.getTotalSize());
-		System.out.println("Disk free space is: "
-				+ utilConnection.getFreeSpace());
-		utilConnection.tearDown();
-	}
-}

samples/com/jacob/samples/system/SystemMonitor.java

@@ -1,75 +0,0 @@
-package com.jacob.samples.system;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.Dispatch;
-import com.jacob.com.EnumVariant;
-import com.jacob.com.Variant;
-
-/**
- * Sample program that shows how to talk to WMI on local machine.
- * 
- * This test program was derived from SourceForge question
- * http://sourceforge.net/forum/forum.php?thread_id=1831650&forum_id=375946
- * fold, spindled and mutilated by clay_shooter
- * 
- * @author chris_knowles
- * 
- */
-public class SystemMonitor {
-
-	/**
-	 * example run loop method called by main()
-	 */
-	public void runMonitor() {
-
-		ActiveXComponent wmi = null;
-		wmi = new ActiveXComponent("WbemScripting.SWbemLocator");
-		// no connection parameters means to connect to the local machine
-		Variant conRet = wmi.invoke("ConnectServer");
-		// the author liked the ActiveXComponent api style over the Dispatch
-		// style
-		ActiveXComponent wmiconnect = new ActiveXComponent(conRet.toDispatch());
-
-		// the WMI supports a query language.
-		String query = "select CategoryString, Message, TimeGenerated, User, Type "
-				+ "from Win32_NtLogEvent "
-				+ "where Logfile = 'Application' and TimeGenerated > '20070915000000.000000-***'";
-		Variant vCollection = wmiconnect
-				.invoke("ExecQuery", new Variant(query));
-
-		EnumVariant enumVariant = new EnumVariant(vCollection.toDispatch());
-
-		String resultString = "";
-		Dispatch item = null;
-
-		while (enumVariant.hasMoreElements()) {
-			resultString = "";
-			item = enumVariant.nextElement().toDispatch();
-			String categoryString = Dispatch.call(item, "CategoryString")
-					.toString();
-			String messageString = Dispatch.call(item, "Message").toString();
-			String timeGenerated = Dispatch.call(item, "TimeGenerated")
-					.toString();
-			String eventUser = Dispatch.call(item, "User").toString();
-			String eventType = Dispatch.call(item, "Type").toString();
-			resultString += "TimeGenerated: " + timeGenerated + " Category: "
-					+ categoryString + " User: " + eventUser + " EventType: "
-					+ eventType + " Message:" + messageString;
-			System.out.println(resultString);
-
-		}
-
-	}
-
-	/**
-	 * sample's main program
-	 * 
-	 * @param args
-	 *            command line arguments
-	 */
-	public static void main(String[] args) {
-		SystemMonitor utilConnection = new SystemMonitor();
-		utilConnection.runMonitor();
-	}
-
-}

samples/com/jacob/samples/visio/VisioApp.java

@@ -1,121 +0,0 @@
-package com.jacob.samples.visio;
-
-import java.io.File;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.DispatchEvents;
-import com.jacob.com.Variant;
-
-/**
- * Created as part of sourceforge 1386454 to demonstrate returning values in
- * event handlers
- * 
- * @author miles@rowansoftware.net
- * 
- * This class represents the visio app itself
- */
-public class VisioApp extends ActiveXComponent {
-
-	/**
-	 * constructor that spins up Visio
-	 * 
-	 * @throws VisioException
-	 */
-	public VisioApp() throws VisioException {
-		super("Visio.Application");
-		setVisible(false);
-	}
-
-	/**
-	 * creates a DispatchEvents object to register o as a listener
-	 * 
-	 * @param o
-	 */
-	public void addEventListener(VisioEventListener o) {
-		DispatchEvents events = new DispatchEvents(this, o);
-		if (events == null) {
-			System.out
-					.println("You should never get null back when creating a DispatchEvents object");
-		}
-	}
-
-	/**
-	 * opens the passed in file in Visio
-	 * 
-	 * @param f
-	 * @throws VisioException
-	 */
-	public void open(File f) throws VisioException {
-		try {
-			ActiveXComponent documents = new ActiveXComponent(getProperty(
-					"Documents").toDispatch());
-			Variant[] args = new Variant[1];
-			args[0] = new Variant(f.getPath());
-			documents.invoke("Open", args);
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new VisioException(e);
-		}
-	}
-
-	/**
-	 * tells Visio to save the drawing
-	 * 
-	 * @throws VisioException
-	 */
-	public void save() throws VisioException {
-		try {
-			ActiveXComponent document = new ActiveXComponent(getProperty(
-					"ActiveDocument").toDispatch());
-			document.invoke("Save");
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new VisioException(e);
-		}
-	}
-
-	/**
-	 * terminates Visio
-	 */
-	public void quit() {
-		System.out.println("Received quit()");
-		// there can't be any open documents for this to work
-		// you'll get a visio error if you don't close them
-		ActiveXComponent document = new ActiveXComponent(getProperty(
-				"ActiveDocument").toDispatch());
-		document.invoke("Close");
-		invoke("Quit");
-	}
-
-	/**
-	 * runs the Visio export command
-	 * 
-	 * @param f
-	 * @throws VisioException
-	 */
-	public void export(File f) throws VisioException {
-		try {
-			ActiveXComponent document = new ActiveXComponent(getProperty(
-					"ActivePage").toDispatch());
-			Variant[] args = new Variant[1];
-			args[0] = new Variant(f.getPath());
-			document.invoke("Export", args);
-		} catch (Exception e) {
-			throw new VisioException(e);
-		}
-	}
-
-	/**
-	 * makes Visio visible so the user can watch
-	 * 
-	 * @param b
-	 * @throws VisioException
-	 */
-	public void setVisible(boolean b) throws VisioException {
-		try {
-			setProperty("Visible", new Variant(b));
-		} catch (Exception e) {
-			throw new VisioException(e);
-		}
-	}
-}

samples/com/jacob/samples/visio/VisioAppFacade.java

@@ -1,180 +0,0 @@
-package com.jacob.samples.visio;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Created as part of sourceforge 1386454 to demonstrate returning values in
- * event handlers
- * 
- * @author miles@rowansoftware.net
- * 
- * This singleton isolates the demo app from the Visio instance object so that
- * you can't try and send messages to a dead Visio instance after quit() has
- * been called. Direct consumption of VisioApp would mean you could quit but
- * would still have a handle to the no longer connected application proxy
- * 
- */
-public class VisioAppFacade {
-
-	private VisioApp app;
-	private static VisioAppFacade instance;
-
-	/** extension for image files */
-	public static final String IMAGE_EXT = ".jpg";
-	/** extension for visio files */
-	public static final String VISIO_EXT = ".vsd";
-	/** the buffer size when we want to read stuff in */
-	public static final int BUFFER_SIZE = 2048;
-
-	/**
-	 * Wrapper around Visio
-	 * 
-	 * @throws VisioException
-	 */
-	private VisioAppFacade() throws VisioException {
-		this.app = new VisioApp();
-		app.addEventListener(new VisioEventAdapter(app));
-	}
-
-	/**
-	 * @return the singleton instance of Visio
-	 * @throws VisioException
-	 */
-	public static VisioAppFacade getInstance() throws VisioException {
-		if (instance == null) {
-			instance = new VisioAppFacade();
-		}
-		return instance;
-	}
-
-	/**
-	 * creates a preview in a temp file and returns the raw data.
-	 * 
-	 * @param visioData
-	 * @return raw preview data
-	 * @throws VisioException
-	 */
-	public byte[] createPreview(byte[] visioData) throws VisioException {
-		byte[] preview;
-		File tmpFile;
-		try {
-			tmpFile = getTempVisioFile();
-			OutputStream out = new FileOutputStream(tmpFile);
-			out.write(visioData);
-			out.close();
-		} catch (IOException ioe) {
-			throw new VisioException(ioe);
-		}
-		preview = createPreview(tmpFile);
-		tmpFile.delete();
-		return preview;
-	}
-
-	/**
-	 * reads a preview from a saved file
-	 * 
-	 * @param visioFile
-	 * @return raw preview data
-	 * @throws VisioException
-	 */
-	public byte[] createPreview(File visioFile) throws VisioException {
-		try {
-			File imageFile;
-			imageFile = getTempImageFile();
-			app.open(visioFile);
-			app.export(imageFile);
-			ByteArrayOutputStream bout = new ByteArrayOutputStream();
-			FileInputStream fin = new FileInputStream(imageFile);
-			copy(fin, bout);
-			fin.close();
-			imageFile.delete();
-			bout.close();
-			return bout.toByteArray();
-		} catch (IOException ioe) {
-			throw new VisioException(ioe);
-		}
-	}
-
-	private void copy(InputStream in, OutputStream out) throws IOException {
-		byte[] buff = new byte[BUFFER_SIZE];
-		int read;
-		do {
-			read = in.read(buff);
-			if (read > 0) {
-				out.write(buff, 0, read);
-			}
-		} while (read > 0);
-	}
-
-	/**
-	 * creates a preview from an input stream
-	 * 
-	 * @param in
-	 * @return byte contents of the preview stream
-	 * @throws VisioException
-	 */
-	public byte[] createPreview(InputStream in) throws VisioException {
-		byte[] preview;
-		// byte[] buff = new byte[2048];
-		// int read = 0;
-		OutputStream out;
-		File tmpFile;
-
-		try {
-			tmpFile = getTempVisioFile();
-			out = new FileOutputStream(tmpFile);
-			copy(in, out);
-			out.close();
-		} catch (IOException ioe) {
-			throw new VisioException(ioe);
-		}
-
-		preview = createPreview(tmpFile);
-		tmpFile.delete();
-		return preview;
-	}
-
-	/**
-	 * opens the file in Visio and makes the editor visible
-	 * 
-	 * @param f
-	 *            the reference to the Visio file to be opened
-	 * @throws VisioException
-	 */
-	public void editDiagram(File f) throws VisioException {
-		app.open(f);
-		app.setVisible(true);
-	}
-
-	/**
-	 * creates a temporary viso file
-	 * 
-	 * @return created visio temporary file
-	 * @throws IOException
-	 */
-	private File getTempVisioFile() throws IOException {
-		return File.createTempFile("java", VISIO_EXT);
-	}
-
-	/**
-	 * creates a temporary image file and returns the File object
-	 * 
-	 * @return the created image file object
-	 * @throws IOException
-	 */
-	private File getTempImageFile() throws IOException {
-		return File.createTempFile("java", IMAGE_EXT);
-	}
-
-	/** exit visio */
-	public void quit() {
-		app.quit();
-		instance = null;
-	}
-}

samples/com/jacob/samples/visio/VisioDemo.java

@@ -1,197 +0,0 @@
-package com.jacob.samples.visio;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.io.File;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
-import javax.swing.filechooser.FileFilter;
-
-import com.jacob.com.ComThread;
-
-/**
- * Created as part of sourceforge 1386454 to demonstrate returning values in
- * event handlers
- * 
- * @author miles@rowansoftware.net
- *         <p>
- *         This file contains the main() that runs the demo
- *         <p>
- *         Look in the docs area at the Jacob usage document for command line
- *         options.
- */
-public class VisioDemo extends JFrame implements ActionListener, WindowListener {
-
-	/**
-	 * Totally dummy value to make Eclipse quit complaining
-	 */
-	private static final long serialVersionUID = 1L;
-
-	JButton chooseButton;
-	JButton openButton;
-	JPanel buttons;
-
-	ImageIcon theImage;
-	JLabel theLabel; // the icon on the page is actually this button's icon
-
-	File selectedFile;
-	/** everyone should get this through getVisio() */
-	private VisioAppFacade visioProxy = null;
-
-	// put this up here so it remembers where we were on the last choose
-	JFileChooser chooser = null;
-
-	public class VisioFileFilter extends FileFilter {
-		public boolean accept(File f) {
-			if (f.isDirectory()) {
-				return true;
-			} else {
-				return (f.getName().toUpperCase().endsWith(".VSD"));
-			}
-		}
-
-		public String getDescription() {
-			return "Visio Drawings";
-		}
-	}
-
-	public VisioDemo() {
-		super("Visio in Swing POC");
-		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		buttons = new JPanel();
-		getContentPane().setLayout(new BorderLayout());
-		chooseButton = new JButton("Choose file to display");
-		openButton = new JButton("Open file chosen file in Visio");
-		chooseButton.addActionListener(this);
-		openButton.addActionListener(this);
-		buttons.add(chooseButton);
-		buttons.add(openButton);
-		getContentPane().add(buttons, BorderLayout.SOUTH);
-		theLabel = new JLabel("");
-		getContentPane().add(theLabel, BorderLayout.CENTER);
-		addWindowListener(this);
-		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-		setSize(640, 480);
-		this.setVisible(true);
-	}
-
-	public static void main(String args[]) throws Exception {
-		SwingUtilities.invokeLater(new Runnable() {
-			public void run() {
-				ComThread.InitSTA();
-				VisioDemo poc = new VisioDemo();
-				ComThread.Release();
-				if (poc == null) {
-					System.out.println("poc== null? That should never happen!");
-				}
-			}
-		});
-	}
-
-	public void actionPerformed(ActionEvent e) {
-		if (e.getSource() == chooseButton) {
-			pickFile();
-		} else if (e.getSource() == openButton) {
-			try {
-				openFile();
-			} catch (Exception ex) {
-				ex.printStackTrace();
-				throw new RuntimeException(ex);
-			}
-		} else {
-			System.out.println("Awesome!");
-		}
-	}
-
-	private void pickFile() {
-		try {
-			chooser = new JFileChooser();
-			// comment this out if you want it to always go to myDocuments
-			chooser
-					.setCurrentDirectory(new File(System
-							.getProperty("user.dir")));
-			chooser.setFileFilter(new VisioFileFilter());
-			int returnVal = chooser.showOpenDialog(this);
-			if (returnVal == JFileChooser.APPROVE_OPTION) {
-				selectedFile = chooser.getSelectedFile();
-				showSelectedFilePreview();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * use this private method instead of initializing on boot up so that
-	 * instance and all listeners are created in this thread (event thread)
-	 * rather than root thread
-	 * 
-	 * @return
-	 */
-	private VisioAppFacade getVisio() {
-		if (visioProxy == null) {
-			try {
-				visioProxy = VisioAppFacade.getInstance();
-			} catch (VisioException ve) {
-				System.out.println("ailed to openFile()");
-				ve.printStackTrace();
-			}
-		}
-		return visioProxy;
-	}
-
-	private void showSelectedFilePreview() throws VisioException {
-		if (selectedFile != null) {
-			byte[] image = getVisio().createPreview(selectedFile);
-			theImage = new ImageIcon(image);
-			theLabel.setIcon(theImage);
-		}
-	}
-
-	private void openFile() throws VisioException {
-		try {
-			getVisio().editDiagram(selectedFile);
-			showSelectedFilePreview();
-		} catch (VisioException ve) {
-			System.out.println("ailed to openFile()");
-			ve.printStackTrace();
-		}
-
-	}
-
-	public void windowActivated(WindowEvent e) {
-	}
-
-	public void windowClosed(WindowEvent e) {
-		System.out.println("WINDOW CLOSED");
-		if (visioProxy != null) {
-			visioProxy.quit();
-		}
-	}
-
-	public void windowClosing(WindowEvent e) {
-	}
-
-	public void windowDeactivated(WindowEvent e) {
-	}
-
-	public void windowDeiconified(WindowEvent e) {
-	}
-
-	public void windowIconified(WindowEvent e) {
-		System.out.println("Fooboo");
-	}
-
-	public void windowOpened(WindowEvent e) {
-	}
-}

samples/com/jacob/samples/visio/VisioEventAdapter.java

@@ -1,68 +0,0 @@
-package com.jacob.samples.visio;
-
-import com.jacob.com.Variant;
-
-/**
- * Created as part of sourceforge 1386454 to demonstrate returning values in
- * event handlers
- * 
- * @author miles@rowansoftware.net
- * 
- * You can subclass this class and only implement the methods you're interested
- * in
- */
-public class VisioEventAdapter implements VisioEventListener {
-
-	VisioApp app = null;
-
-	public VisioEventAdapter(VisioApp pApp) {
-		app = pApp;
-		System.out.println("Event listener constructed");
-	}
-
-	public void BeforeQuit(Variant[] args) {
-	}
-
-	public void DocumentChanged(Variant[] args) {
-		System.out.println("documentChanged()");
-	}
-
-	public void DocumentCloseCanceled(Variant[] args) {
-	}
-
-	public void DocumentCreated(Variant[] args) {
-	}
-
-	public void DocumentOpened(Variant[] args) {
-		System.out.println("DocumentOpened()");
-	}
-
-	public void DocumentSaved(Variant[] args) {
-	}
-
-	public void DocumentSavedAs(Variant[] args) {
-	}
-
-	public Variant QueryCancelDocumentClose(Variant[] args) {
-		System.out.println("QueryCancelDocumentClose()");
-		return new Variant(false);
-	}
-
-	/**
-	 * we don't actually let it quit. We block it so that we don't have to
-	 * relaunch when we look at a new document
-	 */
-	public Variant QueryCancelQuit(Variant[] args) {
-		// these may throw VisioException
-		System.out
-				.println("Saving document, hiding and telling visio not to quit");
-		try {
-			app.save();
-			app.setVisible(false);
-		} catch (VisioException ve) {
-			System.out.println("ailed to openFile()");
-			ve.printStackTrace();
-		}
-		return new Variant(true);
-	}
-}

src/main/cpp/Dispatch.cpp

@@ -279,7 +279,7 @@ JNIEXPORT jintArray JNICALL Java_com_jacob_com_Dispatch_getIDsOfNames
   {
     USES_CONVERSION;
     jstring s = (jstring)env->GetObjectArrayElement(names, i);
-	// if we used env->GetStringChars() would that let us drop the conversion?
+    // if we used env->GetStringChars() would that let us drop the conversion?
     const char *nm = env->GetStringUTFChars(s, NULL);
     LPOLESTR nmos = A2W(nm);
     env->ReleaseStringUTFChars(s, nm);
@@ -319,8 +319,8 @@ static char* BasicToCharString(const BSTR inBasicString)
     if (charStrSize > 1)
     {
         charString = new char[charStrSize];
-		size_t convertedSize;
+        size_t convertedSize;
-		::wcstombs_s(&convertedSize, charString, charStrSize, inBasicString, charStrSize);
+        ::wcstombs_s(&convertedSize, charString, charStrSize, inBasicString, charStrSize);
     }
     else 
     {
@@ -394,14 +394,14 @@ static wchar_t* CreateErrorMsgFromInfo(HRESULT inResult, EXCEPINFO* ioInfo,
     const size_t MSG_LEN = ::wcslen(methNameW) + ::wcslen(msg2) + 256;
     msg = new wchar_t[MSG_LEN];
     ::wcsncpy_s(msg, MSG_LEN, 
-		L"A COM exception has been encountered:\nAt Invoke of: ", 
+        L"A COM exception has been encountered:\nAt Invoke of: ", 
-		wcslen(L"A COM exception has been encountered:\nAt Invoke of: "));
+        wcslen(L"A COM exception has been encountered:\nAt Invoke of: "));
     ::wcsncat_s(msg, MSG_LEN, methNameW, wcslen(methNameW));
     ::wcsncat_s(msg, MSG_LEN, L"\nDescription: ", wcslen(L"\nDescription: "));
     ::wcsncat_s(msg, MSG_LEN, msg2, wcslen(msg2));
     // jacob-msg 1075 - SF 1053872 : Documentation says "use LocalFree"!! 
     //delete msg2;
-	LocalFree(msg2); 
+    LocalFree(msg2); 
   }
   delete methNameW;
   return msg;
@@ -494,15 +494,15 @@ JNIEXPORT jobject JNICALL Java_com_jacob_com_Dispatch_invokev
   jint count = env->GetArrayLength(uArgErr);
   if ( count != 0 )
   {
-	  jint *uAE = env->GetIntArrayElements(uArgErr, NULL);
+      jint *uAE = env->GetIntArrayElements(uArgErr, NULL);
-	  hr = pIDispatch->Invoke(dispID,IID_NULL,
+      hr = pIDispatch->Invoke(dispID,IID_NULL,
-		lcid,(WORD)wFlags,&dispparams,v,&excepInfo,(unsigned int *)uAE); // SF 1689061
+        lcid,(WORD)wFlags,&dispparams,v,&excepInfo,(unsigned int *)uAE); // SF 1689061
-	  env->ReleaseIntArrayElements(uArgErr, uAE, 0);
+      env->ReleaseIntArrayElements(uArgErr, uAE, 0);
   }
   else
   {
-	  hr = pIDispatch->Invoke(dispID,IID_NULL,
+      hr = pIDispatch->Invoke(dispID,IID_NULL,
-		lcid,(WORD)wFlags,&dispparams,v,&excepInfo, NULL); // SF 1689061
+        lcid,(WORD)wFlags,&dispparams,v,&excepInfo, NULL); // SF 1689061
   }
   if (num_args) 
   {
@@ -531,30 +531,30 @@ JNIEXPORT jobject JNICALL Java_com_jacob_com_Dispatch_invokev
     // this method can get called with a name or a dispatch id
     // we need to handle both SF 1114159 
     if (name != NULL){
-	    const char *nm = env->GetStringUTFChars(name, NULL);
+        const char *nm = env->GetStringUTFChars(name, NULL);
-	    buf = CreateErrorMsgFromInfo(hr, &excepInfo, nm);
+        buf = CreateErrorMsgFromInfo(hr, &excepInfo, nm);
-	    env->ReleaseStringUTFChars(name, nm);
+        env->ReleaseStringUTFChars(name, nm);
     } else {
-		dispIdAsName = new char[256];
+        dispIdAsName = new char[256];
-		// get the id string
+        // get the id string
-		_itoa_s (dispID, dispIdAsName, 256,10);
+        _itoa_s (dispID, dispIdAsName, 256,10);
-		//continue on mostly as before
+        //continue on mostly as before
-		buf = CreateErrorMsgFromInfo(hr,&excepInfo,dispIdAsName); 
+        buf = CreateErrorMsgFromInfo(hr,&excepInfo,dispIdAsName); 
     }
     
     // jacob-msg 3696 - SF 1053866
-	if(hr == DISP_E_EXCEPTION)
+    if(hr == DISP_E_EXCEPTION)
-	{
+    {
-		if(excepInfo.scode != 0)
+        if(excepInfo.scode != 0)
-		{
+        {
-			hr = excepInfo.scode;
+            hr = excepInfo.scode;
-		}
+        }
-		else
+        else
-		{
+        {
-			hr = _com_error::WCodeToHRESULT(excepInfo.wCode);
+            hr = _com_error::WCodeToHRESULT(excepInfo.wCode);
-		}
+        }
-	}
+    }
-	
+    
     ThrowComFailUnicode(env, buf, hr);
     if (buf) delete buf;
     if (dispIdAsName) delete dispIdAsName;
@@ -568,20 +568,20 @@ JNIEXPORT jobject JNICALL Java_com_jacob_com_Dispatch_invokev
  * Wait method added so folks could wait until a com server terminated
  */
 JNIEXPORT jint JNICALL Java_com_jacob_com_Dispatch_hasExited
-		(JNIEnv *env,jclass clazz, jobject disp, jint dispid, jint lcid) {
+        (JNIEnv *env,jclass clazz, jobject disp, jint dispid, jint lcid) {
-	IDispatch *pIDispatch = extractDispatch(env, disp);
+    IDispatch *pIDispatch = extractDispatch(env, disp);
-	if (!pIDispatch) {
+    if (!pIDispatch) {
-		// should we return 0?
+        // should we return 0?
-		return NULL;
+        return NULL;
-	}
+    }
-	ITypeInfo *v;
+    ITypeInfo *v;
-	HRESULT hr = pIDispatch->GetTypeInfo(dispid, lcid, &v);
+    HRESULT hr = pIDispatch->GetTypeInfo(dispid, lcid, &v);
-	if (hr == RPC_E_SERVERCALL_RETRYLATER || hr == RPC_E_CALL_REJECTED || hr
+    if (hr == RPC_E_SERVERCALL_RETRYLATER || hr == RPC_E_CALL_REJECTED || hr
-			== 0) {
+            == 0) {
-		return 0;
+        return 0;
-	} else {
+    } else {
-		return 1;
+        return 1;
-	}
+    }
 }
 
 }

src/main/cpp/DispatchEvents.cpp

@@ -74,32 +74,32 @@ JNIEXPORT void JNICALL Java_com_jacob_com_DispatchEvents_init3
     jstring _progid, 
     jstring _typelib)
 {
-	USES_CONVERSION;
+    USES_CONVERSION;
 
   if (_typelib != NULL && _progid == NULL){
-  	// both are required if typelib exists
+      // both are required if typelib exists
-  	ThrowComFail(env,"TypeLib was specified but no program id was",-1);
+      ThrowComFail(env,"TypeLib was specified but no program id was",-1);
-  	return;
+      return;
   }
   
   BSTR typeLib = NULL;
   if (_typelib != NULL){
-  	  // why is this UTF instead of unicode? Then we could probably drop the A2W
+        // why is this UTF instead of unicode? Then we could probably drop the A2W
-	  const char *typelib = env->GetStringUTFChars(_typelib, NULL);
+      const char *typelib = env->GetStringUTFChars(_typelib, NULL);
-	  typeLib = A2W(typelib);
+      typeLib = A2W(typelib);
-	  // should we call env->ReleaseStringUTFChars(,) to free the memory like we do everywhere lese?
+      // should we call env->ReleaseStringUTFChars(,) to free the memory like we do everywhere lese?
-	  
+      
-	  //printf("we have a type lib %ls\n",typeLib);
+      //printf("we have a type lib %ls\n",typeLib);
   }
 
   // find progid if any
   LPOLESTR bsProgId = NULL;
   if (_progid!=NULL) {
-    	// why is this UTF instead of unicode?  Then we could probably drop the A2W
+        // why is this UTF instead of unicode?  Then we could probably drop the A2W
-    	const char *progid = env->GetStringUTFChars(_progid, NULL);
+        const char *progid = env->GetStringUTFChars(_progid, NULL);
-		bsProgId = A2W(progid);
+        bsProgId = A2W(progid);
-	  // should we call env->ReleaseStringUTFChars(,) to free the memory like we do everywhere lese?
+      // should we call env->ReleaseStringUTFChars(,) to free the memory like we do everywhere lese?
-		//printf("we have an applicaton %ls\n",bsProgId);
+        //printf("we have an applicaton %ls\n",bsProgId);
   }
   
   // get the IDispatch for the source object
@@ -119,15 +119,15 @@ JNIEXPORT void JNICALL Java_com_jacob_com_DispatchEvents_init3
   DISPID *mIDs;
   int n_EventMethods;
   if (_typelib == NULL){
-	  if (!GetEventIID(pUnk, &eventIID, &mNames, &mIDs, &n_EventMethods,bsProgId)) {
+      if (!GetEventIID(pUnk, &eventIID, &mNames, &mIDs, &n_EventMethods,bsProgId)) {
-    	ThrowComFail(env, "Can't find event iid", -1);
+        ThrowComFail(env, "Can't find event iid", -1);
-	    return;
+        return;
-	  }
+      }
   } else {
-	  if (!GetEventIIDForTypeLib(typeLib, &eventIID, &mNames, &mIDs, &n_EventMethods,bsProgId)) {
+      if (!GetEventIIDForTypeLib(typeLib, &eventIID, &mNames, &mIDs, &n_EventMethods,bsProgId)) {
-    	ThrowComFail(env, "Can't find event iid for type lib", -1);
+        ThrowComFail(env, "Can't find event iid for type lib", -1);
-	    return;
+        return;
-	  }
+      }
   }
 
   // hook up to the default source iid
@@ -153,10 +153,10 @@ JNIEXPORT void JNICALL Java_com_jacob_com_DispatchEvents_release
 {
   EventProxy *ep = extractProxy(env, _this);
   if (ep) {
-	// Disconnect must be called to reduce the ref count to the EventProxy otherwise
+    // Disconnect must be called to reduce the ref count to the EventProxy otherwise
-	// the destructor will never be called (to actually do the disconnect)
+    // the destructor will never be called (to actually do the disconnect)
-	ep->Disconnect(); // SF 3412922
+    ep->Disconnect(); // SF 3412922
-  	// this is the line that blows up in IETest
+      // this is the line that blows up in IETest
     ep->Release();
     putProxy(env, _this, NULL);
   }
@@ -219,15 +219,15 @@ BOOL GetEventIID(IUnknown *m_pObject, IID* piid,
   {
     //printf("got IProvideClassInfo\n");
     ATLASSERT(pPCI != NULL);
-		HRESULT hr = pPCI->GetClassInfo(&pClassInfo);
+        HRESULT hr = pPCI->GetClassInfo(&pClassInfo);
     pPCI->Release();
     if (!SUCCEEDED(hr)) return false;
   }
   else if (getClassInfoFromProgId(bsProgId,&pClassInfo)) {
-	}
+    }
-	else  {
+    else  {
     printf("GetEventIID: couldn't get IProvideClassInfo\n");
-		return false;
+        return false;
   }
 
   return MapEventIIDs(piid, mNames, mIDs, nmeth, bsProgId, pClassInfo);
@@ -249,7 +249,7 @@ BOOL MapEventIIDs(IID* piid,
         int nFlags;
         HREFTYPE hRefType;
 
-		//printf("MapEventIIDs: looking at %d class attribute impl types \n");
+        //printf("MapEventIIDs: looking at %d class attribute impl types \n");
         for (unsigned int i = 0; i < pClassAttr->cImplTypes; i++)
         {
           if (SUCCEEDED(pClassInfo->GetImplTypeFlags(i, &nFlags)) &&
@@ -300,25 +300,25 @@ BOOL getClassInfoFromProgId(LPOLESTR bsProgId,LPTYPEINFO *pClassInfo)
   LONG lVal;
   lVal = RegOpenKeyEx(HKEY_LOCAL_MACHINE,_T("SOFTWARE"),0,KEY_READ,&keySoftware);
   if (lVal==ERROR_SUCCESS) {
-		lVal = RegOpenKeyEx(keySoftware,_T("Classes"),0,KEY_READ,&keyClasses);
+        lVal = RegOpenKeyEx(keySoftware,_T("Classes"),0,KEY_READ,&keyClasses);
-		if (lVal==ERROR_SUCCESS) {
+        if (lVal==ERROR_SUCCESS) {
-			lVal = RegOpenKeyEx(keyClasses,_T("CLSID"),0,KEY_READ,&keyCLSID);
+            lVal = RegOpenKeyEx(keyClasses,_T("CLSID"),0,KEY_READ,&keyCLSID);
-			if (lVal==ERROR_SUCCESS) {
+            if (lVal==ERROR_SUCCESS) {
-				_TCHAR *tsProgId = W2T(bsProgId);
+                _TCHAR *tsProgId = W2T(bsProgId);
-				lVal = RegOpenKeyEx(keyCLSID,tsProgId,0,KEY_READ,&keyXXXX);
+                lVal = RegOpenKeyEx(keyCLSID,tsProgId,0,KEY_READ,&keyXXXX);
-				if (lVal==ERROR_SUCCESS) {
+                if (lVal==ERROR_SUCCESS) {
-					lVal = RegOpenKeyEx(keyXXXX,_T("TypeLib"),0,KEY_READ,&keyTypeLib);
+                    lVal = RegOpenKeyEx(keyXXXX,_T("TypeLib"),0,KEY_READ,&keyTypeLib);
-					if (lVal==ERROR_SUCCESS) {
+                    if (lVal==ERROR_SUCCESS) {
-						lVal = RegQueryValueExA(keyTypeLib,NULL,NULL,&dwType,abData,&dwCountData);
+                        lVal = RegQueryValueExA(keyTypeLib,NULL,NULL,&dwType,abData,&dwCountData);
-						RegCloseKey(keyTypeLib);
+                        RegCloseKey(keyTypeLib);
-				  }
+                  }
-					RegCloseKey(keyXXXX);
+                    RegCloseKey(keyXXXX);
-			  }
+              }
-				RegCloseKey(keyCLSID);
+                RegCloseKey(keyCLSID);
-			}
+            }
-			RegCloseKey(keyClasses);
+            RegCloseKey(keyClasses);
-		}
+        }
-		RegCloseKey(keySoftware);
+        RegCloseKey(keySoftware);
   }
   if (lVal!=ERROR_SUCCESS) return false;
   BSTR bsLibId = A2BSTR((char*)abData);
@@ -344,7 +344,7 @@ BOOL getClassInfoFromProgIdTypeLib(BSTR typeLib, LPOLESTR bsProgId, LPTYPEINFO *
   if (FAILED(StringFromCLSID(clsid,&bsProgId))) return false;
 
   ITypeLib* pITypeLib;
-  if (FAILED(LoadTypeLib(typeLib, &pITypeLib)))	return false;
+  if (FAILED(LoadTypeLib(typeLib, &pITypeLib)))    return false;
 
   //Find ITypeInfo for coclass.
   pITypeLib->GetTypeInfoOfGuid(clsid, pClassInfo);
@@ -358,9 +358,9 @@ BOOL GetEventIIDForTypeLib(BSTR typeLib, IID* piid,
   LPTYPEINFO pClassInfo = NULL;
   if(getClassInfoFromProgIdTypeLib(typeLib, bsProgId,&pClassInfo))
   {
-  	if (pClassInfo == NULL){
+      if (pClassInfo == NULL){
-  		printf("we had a successful return but pClassInfo is null\n");
+          printf("we had a successful return but pClassInfo is null\n");
-  	}
+      }
     return MapEventIIDs(piid, mNames, mIDs, nmeth, bsProgId, pClassInfo);
   }
   else

src/main/cpp/DispatchProxy.cpp

@@ -97,7 +97,7 @@ JNIEXPORT void JNICALL Java_com_jacob_com_DispatchProxy_release
   IStream *ps =  extractStream(env, _this);
   if (ps) {
     ps->Release();
-		jclass argClass = env->GetObjectClass(_this);
+        jclass argClass = env->GetObjectClass(_this);
     jfieldID ajf = env->GetFieldID( argClass, "m_pStream", "J");
     env->SetLongField(_this, ajf, 0ll);
   }

src/main/cpp/EnumVariant.cpp

@@ -48,7 +48,7 @@ JNIEXPORT jint JNICALL
 Java_com_jacob_com_EnumVariant_Next(JNIEnv* env, jobject _this, jobjectArray vars)
 {
   IEnumVARIANT* self = extractEnumVariant(env, _this);
-	//printf("self=%x\n", self);
+    //printf("self=%x\n", self);
   if(self == NULL)
     return 0;
 

src/main/cpp/SafeArray.cpp

@@ -1877,7 +1877,7 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_setString__ILjava_lang_Strin
     env->ReleaseStringChars(s, str);
     VariantClear(&v);
   } else if (vt == VT_BSTR) {
-	// SF 2847577 support unicode move from GetStringUTFChars() to GetStringChars()
+    // SF 2847577 support unicode move from GetStringUTFChars() to GetStringChars()
     const jchar *str = env->GetStringChars(s, NULL);
     CComBSTR bs((LPCOLESTR)str);
     SafeArrayPutElement(sa,&idx,bs.Detach());
@@ -2623,12 +2623,12 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_setVariants
 }
 
 /* PLEASE NOTE THE LINE: 
-	jint *jIndices = env->GetIntArrayElements(indices, NULL);
+    jint *jIndices = env->GetIntArrayElements(indices, NULL);
-	which I added to replace "long idx[2] = {i,j};" from the 2D case.
+    which I added to replace "long idx[2] = {i,j};" from the 2D case.
-	Not sure if this is correct. Also, check that I am doing the null test and
+    Not sure if this is correct. Also, check that I am doing the null test and
-	dimension test correctly.
+    dimension test correctly.
-	Would really like to call     env->ReleaseIntArrayElements(indices, jIndices, NULL);    
+    Would really like to call     env->ReleaseIntArrayElements(indices, jIndices, NULL);    
-	in here but I can't get it to work
+    in here but I can't get it to work
 */
 
 #define GETNDCODE(varType, varAccess, jtyp) \
@@ -2669,12 +2669,12 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_setVariants
 //---------------------------------
 
 /* PLEASE NOTE THE LINE: 
-	jint *jIndices = env->GetIntArrayElements(indices, NULL);
+    jint *jIndices = env->GetIntArrayElements(indices, NULL);
-	which I added to replace "long idx[2] = {i,j};" from the 2D case.
+    which I added to replace "long idx[2] = {i,j};" from the 2D case.
-	Not sure if this is correct. Also, check that I am doing the null test and
+    Not sure if this is correct. Also, check that I am doing the null test and
-	dimension test correctly.
+    dimension test correctly.
-	Would really like to call     env->ReleaseIntArrayElements(indices, jIndices, NULL);    
+    Would really like to call     env->ReleaseIntArrayElements(indices, jIndices, NULL);    
-	in here but I can't get it to work
+    in here but I can't get it to work
  */
 
 #define SETNDCODE(varType, varAccess) \

src/main/cpp/Variant.cpp

@@ -116,26 +116,26 @@ void zeroVariant(JNIEnv *env, jobject _this)
 JNIEXPORT jbyteArray JNICALL Java_com_jacob_com_Variant_SerializationWriteToBytes
   (JNIEnv *env, jobject _this){
   VARIANT *v = extractVariant(env, _this);
-	  if (v) 
+      if (v) 
-	  {
+      {
-	    DWORD flags = MSHCTX_LOCAL;
+        DWORD flags = MSHCTX_LOCAL;
-	    jint size = VARIANT_UserSize(&flags, 0L, v);
+        jint size = VARIANT_UserSize(&flags, 0L, v);
-	    // allocate a byte array of the right length
+        // allocate a byte array of the right length
-	    jbyte* pBuf = new jbyte[size];
+        jbyte* pBuf = new jbyte[size];
-	    // clear it out
+        // clear it out
-	    ZeroMemory(pBuf, size);
+        ZeroMemory(pBuf, size);
-	    // marshall the Variant into the buffer
+        // marshall the Variant into the buffer
-	    VARIANT_UserMarshal(&flags, (unsigned char *)pBuf, v);
+        VARIANT_UserMarshal(&flags, (unsigned char *)pBuf, v);
-	    // need to convert the buffer to a java byte ba[]
+        // need to convert the buffer to a java byte ba[]
-	    jbyteArray ba = env->NewByteArray(size);
+        jbyteArray ba = env->NewByteArray(size);
-	    env->SetByteArrayRegion(ba, 0, size, pBuf);
+        env->SetByteArrayRegion(ba, 0, size, pBuf);
-	    // and delete the original memory
+        // and delete the original memory
-	    delete [] pBuf;
+        delete [] pBuf;
-		return ba;
+        return ba;
-	  } else {
+      } else {
-	    jbyteArray ba = env->NewByteArray(0);
+        jbyteArray ba = env->NewByteArray(0);
-	    return ba;
+        return ba;
-	  }
+      }
   }
   
 /**
@@ -148,17 +148,17 @@ JNIEXPORT void JNICALL Java_com_jacob_com_Variant_SerializationReadFromBytes
   (JNIEnv *env, jobject _this, jbyteArray ba){
 
   VARIANT *v = extractVariant(env, _this);
-	if (v){
+    if (v){
-		// get a buffer from it
+        // get a buffer from it
-		jbyte *pBuf = env->GetByteArrayElements(ba, 0);
+        jbyte *pBuf = env->GetByteArrayElements(ba, 0);
-		// unmarshall the Variant from the buffer
+        // unmarshall the Variant from the buffer
-		DWORD flags = MSHCTX_LOCAL;
+        DWORD flags = MSHCTX_LOCAL;
-		printf("about to unmarshall array elements\n");
+        printf("about to unmarshall array elements\n");
-		VARIANT_UserUnmarshal(&flags, (unsigned char *)pBuf, v);
+        VARIANT_UserUnmarshal(&flags, (unsigned char *)pBuf, v);
-		// release the byte array
+        // release the byte array
-	    printf("about to release array elements\n");
+        printf("about to release array elements\n");
-		env->ReleaseByteArrayElements(ba, pBuf, 0);
+        env->ReleaseByteArrayElements(ba, pBuf, 0);
-	}
+    }
   }
 
 /**
@@ -272,13 +272,13 @@ JNIEXPORT void JNICALL Java_com_jacob_com_Variant_putVariantStringRef
   if (v) {
     VariantClear(v); // whatever was there before
 
-	const jchar *cStr = env->GetStringChars(s,NULL);
+    const jchar *cStr = env->GetStringChars(s,NULL);
-	// SF 1314116 
+    // SF 1314116 
-	// DBeck: 2005-09-23: changed CComBSTR c-tor to accept
+    // DBeck: 2005-09-23: changed CComBSTR c-tor to accept
-	//	Unicode string (no terminating NULL) provided by GetStringChars
+    //    Unicode string (no terminating NULL) provided by GetStringChars
-	const jsize numChars = env->GetStringLength(s);
+    const jsize numChars = env->GetStringLength(s);
     //CComBSTR bs(cStr);
-	CComBSTR bs( numChars, (LPCOLESTR)cStr ); // SR cast SF 1689061
+    CComBSTR bs( numChars, (LPCOLESTR)cStr ); // SR cast SF 1689061
 
     BSTR *pbs = (BSTR *)CoTaskMemAlloc(sizeof(BSTR));
     bs.CopyTo(pbs);
@@ -802,11 +802,11 @@ JNIEXPORT void JNICALL Java_com_jacob_com_Variant_putVariantString
 
     const jchar *cStr = env->GetStringChars(s,NULL);
     // SF 1314116 
-	// DBeck: 2005-09-23: changed CComBSTR c-tor to accept
+    // DBeck: 2005-09-23: changed CComBSTR c-tor to accept
-	//	Unicode string (no terminating NULL) provided by GetStringChars
+    //    Unicode string (no terminating NULL) provided by GetStringChars
-	const jsize numChars = env->GetStringLength(s);
+    const jsize numChars = env->GetStringLength(s);
     //CComBSTR bs(cStr);
-	CComBSTR bs( numChars, (LPCOLESTR)cStr ); // SR cast SF 1689061
+    CComBSTR bs( numChars, (LPCOLESTR)cStr ); // SR cast SF 1689061
 
     V_VT(v) = VT_BSTR;
     V_BSTR(v) = bs.Copy();
@@ -975,7 +975,7 @@ JNIEXPORT void JNICALL Java_com_jacob_com_Variant_putVariantNoParam
 {
   VARIANT *v = extractVariant(env, _this);
   if (v) {
-  	// SF 3377279 clear variable to fix leak
+      // SF 3377279 clear variable to fix leak
     VariantClear(v);
     V_VT(v) = VT_ERROR;
     V_ERROR(v) = DISP_E_PARAMNOTFOUND;
@@ -1041,7 +1041,7 @@ JNIEXPORT jshort JNICALL Java_com_jacob_com_Variant_getVariantType
 /**
  * this is a big cover method that returns TRUE if 
  * the variant type is 
- * 	VT_EMPTY, VT_NULL, VT_ERROR or VT_DISPATCH with no dispatch object
+ *     VT_EMPTY, VT_NULL, VT_ERROR or VT_DISPATCH with no dispatch object
  * */
 JNIEXPORT jboolean JNICALL Java_com_jacob_com_Variant_isVariantConsideredNull
   (JNIEnv *env, jobject _this)
@@ -1110,14 +1110,14 @@ JNIEXPORT jlong JNICALL Java_com_jacob_com_Variant_getVariantVariant
       return NULL;
     }
 
-	VARIANT *refVar = V_VARIANTREF(v);
+    VARIANT *refVar = V_VARIANTREF(v);
 
-	// we could have made a copy of refV here but we aren't every going to free 
+    // we could have made a copy of refV here but we aren't every going to free 
-	// it outside of the scope of the enclosing context so we will just used the
+    // it outside of the scope of the enclosing context so we will just used the
-	// enclosed.  This relies on the java layer to zero out its ref to this
+    // enclosed.  This relies on the java layer to zero out its ref to this
-	// enclosed variant before the gc can come along and free the memory out from
+    // enclosed variant before the gc can come along and free the memory out from
-	// under this enclosing variant.
+    // under this enclosing variant.
-	return (jlong)refVar;
+    return (jlong)refVar;
   }
 
   return NULL;
@@ -1136,9 +1136,9 @@ JNIEXPORT jlong JNICALL Java_com_jacob_com_Variant_getVariantVariant
       DECIMAL *pd = (DECIMAL *)CoTaskMemAlloc(sizeof(DECIMAL));
       pd->scale = scale;
       if (signum == 1 || signum == 0){
-    	  pd->sign = 0;
+          pd->sign = 0;
       } else {
-    	  pd->sign = 0x80;
+          pd->sign = 0x80;
       }
       pd->Hi32 = hi;
       pd->Mid32 = mid;
@@ -1163,9 +1163,9 @@ JNIEXPORT jlong JNICALL Java_com_jacob_com_Variant_getVariantVariant
       d = (DECIMAL*)v;
       d->scale = scale;
       if (signum == 1 || signum == 0){
-    	  d->sign = 0;
+          d->sign = 0;
       } else {
-    	  d->sign = 0x80;
+          d->sign = 0x80;
       }
       d->Hi32 = hi;
       d->Mid32 = mid;

src/main/cpp/util.cpp

@@ -37,7 +37,7 @@ void ThrowComFail(JNIEnv *env, const char* desc, jint hr)
   jmethodID failCons = 
      env->GetMethodID(failClass, "<init>", "(ILjava/lang/String;)V");
   if (!desc) {
-	  desc = "Java/COM Error";
+      desc = "Java/COM Error";
   }
   jstring js = env->NewStringUTF(desc);
   jthrowable fail = (jthrowable)env->NewObject(failClass, failCons, hr, js);
@@ -47,7 +47,7 @@ void ThrowComFail(JNIEnv *env, const char* desc, jint hr)
 void ThrowComFailUnicode(JNIEnv *env, const wchar_t* desc, jint hr)
 {
   if (!desc) {
-	  ThrowComFail(env, "Java/COM Error", hr);
+      ThrowComFail(env, "Java/COM Error", hr);
   }
   jclass failClass = env->FindClass("com/jacob/com/ComFailException");
   // call the constructor that takes hr and message
@@ -67,9 +67,9 @@ int CheckEnv(JNIEnv *env1, JNIEnv *env2)
     jmethodID failCons = 
        env1->GetMethodID(failClass, "<init>", "()V");
     env1->ThrowNew(failClass, "Wrong Thread");
-		return 0;
+        return 0;
   }
-	return 1;
+    return 1;
 }
 
 }

src/main/headers/Dispatch.h

@@ -87,7 +87,7 @@ JNIEXPORT jobject JNICALL Java_com_jacob_com_Dispatch_invokev
  * Signature: (Ljava/lang/Object;I;)I
  */
 JNIEXPORT jint JNICALL Java_com_jacob_com_Dispatch_hasExited
-	(JNIEnv *, jclass, jobject, jint, jint);
+    (JNIEnv *, jclass, jobject, jint, jint);
 
 #ifdef __cplusplus
 }

src/main/headers/EventProxy.h

@@ -37,13 +37,13 @@ class EventProxy : public IDispatch
 {
 private:
   int     connected;
-  LONG    m_cRef;		// a reference counter
+  LONG    m_cRef;        // a reference counter
   CComPtr<IConnectionPoint> pCP; // the connection point
   DWORD   dwEventCookie; // connection point cookie
   jobject javaSinkObj;   // the java object to delegate calls
 
   IID     eventIID;      // the interface iid passed in
-  int     MethNum;		// number of methods in the callback interface
+  int     MethNum;        // number of methods in the callback interface
   CComBSTR *MethName;   // Array of method names
   DISPID   *MethID;     // Array of method ids, used to match invokations to method names
   JavaVM   *jvm;        // The java vm we are running
@@ -53,7 +53,7 @@ public:
   // constuct with a global JNI ref to a sink object
   // to which we will delegate event callbacks
   EventProxy(JNIEnv *jenv, 
-  		jobject aSinkObj, 
+          jobject aSinkObj, 
         CComPtr<IConnectionPoint> pConn, 
         IID eventIID, 
         CComBSTR *mName, 
@@ -72,7 +72,7 @@ public:
   {
     LONG res = InterlockedDecrement(&m_cRef);
     if (res == 0) {
-    	delete this;
+        delete this;
     }
     return res;
     

src/main/headers/atlchecked.h

@@ -29,23 +29,23 @@ namespace ATL
 
 inline errno_t AtlCrtErrorCheck(_In_ errno_t nError)
 {
-	switch(nError)
+    switch(nError)
-	{
+    {
-	case ENOMEM:
+    case ENOMEM:
-		AtlThrow(E_OUTOFMEMORY);
+        AtlThrow(E_OUTOFMEMORY);
-		break;
+        break;
-	case EINVAL:
+    case EINVAL:
-	case ERANGE:
+    case ERANGE:
-		AtlThrow(E_INVALIDARG);
+        AtlThrow(E_INVALIDARG);
-		break;
+        break;
-	case 0:
+    case 0:
-	case STRUNCATE:
+    case STRUNCATE:
-		break;
+        break;
-	default:
+    default:
-		AtlThrow(E_FAIL);
+        AtlThrow(E_FAIL);
-		break;
+        break;
-	}
+    }
-	return nError;
+    return nError;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -61,331 +61,331 @@ namespace Checked
 #endif
 
 inline void __cdecl memcpy_s(
-	_Out_bytecap_post_bytecount_(_S1max,_N)  void *_S1,
+    _Out_bytecap_post_bytecount_(_S1max,_N)  void *_S1,
-	_In_ size_t _S1max,
+    _In_ size_t _S1max,
-	_In_bytecount_(_N) const void *_S2,
+    _In_bytecount_(_N) const void *_S2,
-	_In_ size_t _N)
+    _In_ size_t _N)
 {
-	ATLMFC_CRT_ERRORCHECK(::memcpy_s(_S1, _S1max, _S2, _N));
+    ATLMFC_CRT_ERRORCHECK(::memcpy_s(_S1, _S1max, _S2, _N));
 }
 
 inline void __cdecl wmemcpy_s(
-	_Out_cap_post_count_(_N1,_N) wchar_t *_S1,
+    _Out_cap_post_count_(_N1,_N) wchar_t *_S1,
-	_In_ size_t _N1,
+    _In_ size_t _N1,
-	_In_count_(_N) const wchar_t *_S2,
+    _In_count_(_N) const wchar_t *_S2,
-	_In_ size_t _N)
+    _In_ size_t _N)
 {
-	ATLMFC_CRT_ERRORCHECK(::wmemcpy_s(_S1, _N1, _S2, _N));
+    ATLMFC_CRT_ERRORCHECK(::wmemcpy_s(_S1, _N1, _S2, _N));
 }
 
 inline void __cdecl memmove_s(
-	_Out_bytecap_post_bytecount_(_S1max,_N) void *_S1,
+    _Out_bytecap_post_bytecount_(_S1max,_N) void *_S1,
-	_In_ size_t _S1max,
+    _In_ size_t _S1max,
-	_In_bytecount_(_N) const void *_S2,
+    _In_bytecount_(_N) const void *_S2,
-	_In_ size_t _N)
+    _In_ size_t _N)
 {
-	ATLMFC_CRT_ERRORCHECK(::memmove_s(_S1, _S1max, _S2, _N));
+    ATLMFC_CRT_ERRORCHECK(::memmove_s(_S1, _S1max, _S2, _N));
 }
 
 inline void __cdecl strcpy_s(
-	_Out_z_cap_(_S1max) char *_S1,
+    _Out_z_cap_(_S1max) char *_S1,
-	_In_ size_t _S1max,
+    _In_ size_t _S1max,
-	_In_z_ const char *_S2)
+    _In_z_ const char *_S2)
 {
-	ATLMFC_CRT_ERRORCHECK(::strcpy_s(_S1, _S1max, _S2));
+    ATLMFC_CRT_ERRORCHECK(::strcpy_s(_S1, _S1max, _S2));
 }
 
 inline void __cdecl wcscpy_s(
-	_Out_z_cap_(_S1max) wchar_t *_S1,
+    _Out_z_cap_(_S1max) wchar_t *_S1,
-	_In_ size_t _S1max,
+    _In_ size_t _S1max,
-	_In_z_ const wchar_t *_S2)
+    _In_z_ const wchar_t *_S2)
 {
-	ATLMFC_CRT_ERRORCHECK(::wcscpy_s(_S1, _S1max, _S2));
+    ATLMFC_CRT_ERRORCHECK(::wcscpy_s(_S1, _S1max, _S2));
 }
 
 inline void __cdecl tcscpy_s(
-	_Out_z_cap_(_SizeInChars) TCHAR * _Dst,
+    _Out_z_cap_(_SizeInChars) TCHAR * _Dst,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_z_ const TCHAR * _Src)
+    _In_z_ const TCHAR * _Src)
 {
-	ATLMFC_CRT_ERRORCHECK(::_tcscpy_s(_Dst, _SizeInChars, _Src));
+    ATLMFC_CRT_ERRORCHECK(::_tcscpy_s(_Dst, _SizeInChars, _Src));
 }
 
 inline errno_t __cdecl strncpy_s(
-	_Out_z_cap_(_SizeInChars) char *_Dest,
+    _Out_z_cap_(_SizeInChars) char *_Dest,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_z_ const char *_Source,
+    _In_z_ const char *_Source,
-	_In_ size_t _Count)
+    _In_ size_t _Count)
 {
-	return ATLMFC_CRT_ERRORCHECK(::strncpy_s(_Dest, _SizeInChars, _Source,_Count));
+    return ATLMFC_CRT_ERRORCHECK(::strncpy_s(_Dest, _SizeInChars, _Source,_Count));
 }
 
 inline errno_t __cdecl wcsncpy_s(
-	_Out_z_cap_(_SizeInChars) wchar_t *_Dest,
+    _Out_z_cap_(_SizeInChars) wchar_t *_Dest,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_z_ const wchar_t *_Source,
+    _In_z_ const wchar_t *_Source,
-	_In_ size_t _Count)
+    _In_ size_t _Count)
 {
-	return ATLMFC_CRT_ERRORCHECK(::wcsncpy_s(_Dest, _SizeInChars, _Source,_Count));
+    return ATLMFC_CRT_ERRORCHECK(::wcsncpy_s(_Dest, _SizeInChars, _Source,_Count));
 }
 
 inline errno_t __cdecl tcsncpy_s(
-	_Out_z_cap_(_SizeInChars) TCHAR *_Dest,
+    _Out_z_cap_(_SizeInChars) TCHAR *_Dest,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_z_ const TCHAR *_Source,
+    _In_z_ const TCHAR *_Source,
-	_In_ size_t _Count)
+    _In_ size_t _Count)
 {
-	return ATLMFC_CRT_ERRORCHECK(::_tcsncpy_s(_Dest, _SizeInChars, _Source,_Count));
+    return ATLMFC_CRT_ERRORCHECK(::_tcsncpy_s(_Dest, _SizeInChars, _Source,_Count));
 }
 
 inline void __cdecl strcat_s(
-	_Inout_z_cap_(_SizeInChars) char * _Dst,
+    _Inout_z_cap_(_SizeInChars) char * _Dst,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_z_ const char * _Src)
+    _In_z_ const char * _Src)
 {
-	ATLMFC_CRT_ERRORCHECK(::strcat_s(_Dst, _SizeInChars, _Src));
+    ATLMFC_CRT_ERRORCHECK(::strcat_s(_Dst, _SizeInChars, _Src));
 }
 
 inline void __cdecl wcscat_s(
-	_Inout_z_cap_(_SizeInChars) wchar_t * _Dst,
+    _Inout_z_cap_(_SizeInChars) wchar_t * _Dst,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_z_ const wchar_t * _Src)
+    _In_z_ const wchar_t * _Src)
 {
-	ATLMFC_CRT_ERRORCHECK(::wcscat_s(_Dst, _SizeInChars, _Src));
+    ATLMFC_CRT_ERRORCHECK(::wcscat_s(_Dst, _SizeInChars, _Src));
 }
 
 inline void __cdecl tcscat_s(
-	_Inout_z_cap_(_SizeInChars) TCHAR * _Dst,
+    _Inout_z_cap_(_SizeInChars) TCHAR * _Dst,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_z_ const TCHAR * _Src)
+    _In_z_ const TCHAR * _Src)
 {
-	ATLMFC_CRT_ERRORCHECK(::_tcscat_s(_Dst, _SizeInChars, _Src));
+    ATLMFC_CRT_ERRORCHECK(::_tcscat_s(_Dst, _SizeInChars, _Src));
 }
 
 inline void __cdecl strlwr_s(
-	_Inout_z_cap_(_SizeInChars) char * _Str,
+    _Inout_z_cap_(_SizeInChars) char * _Str,
-	_In_ size_t _SizeInChars)
+    _In_ size_t _SizeInChars)
 {
-	ATLMFC_CRT_ERRORCHECK(::_strlwr_s(_Str, _SizeInChars));
+    ATLMFC_CRT_ERRORCHECK(::_strlwr_s(_Str, _SizeInChars));
 }
 
 inline void __cdecl wcslwr_s(
-	_Inout_z_cap_(_SizeInChars) wchar_t * _Str,
+    _Inout_z_cap_(_SizeInChars) wchar_t * _Str,
-	_In_ size_t _SizeInChars)
+    _In_ size_t _SizeInChars)
 {
-	ATLMFC_CRT_ERRORCHECK(::_wcslwr_s(_Str, _SizeInChars));
+    ATLMFC_CRT_ERRORCHECK(::_wcslwr_s(_Str, _SizeInChars));
 }
 
 inline void __cdecl mbslwr_s(
-	_Inout_z_bytecap_(_SizeInChars) unsigned char * _Str,
+    _Inout_z_bytecap_(_SizeInChars) unsigned char * _Str,
-	_In_ size_t _SizeInChars)
+    _In_ size_t _SizeInChars)
 {
-	ATLMFC_CRT_ERRORCHECK(::_mbslwr_s(_Str, _SizeInChars));
+    ATLMFC_CRT_ERRORCHECK(::_mbslwr_s(_Str, _SizeInChars));
 }
 
 inline void __cdecl tcslwr_s(
-	_Inout_z_cap_(_SizeInChars) TCHAR * _Str,
+    _Inout_z_cap_(_SizeInChars) TCHAR * _Str,
-	_In_ size_t _SizeInChars)
+    _In_ size_t _SizeInChars)
 {
-	ATLMFC_CRT_ERRORCHECK(::_tcslwr_s(_Str, _SizeInChars));
+    ATLMFC_CRT_ERRORCHECK(::_tcslwr_s(_Str, _SizeInChars));
 }
 
 inline void __cdecl strupr_s(
-	_Inout_z_cap_(_SizeInChars) char * _Str,
+    _Inout_z_cap_(_SizeInChars) char * _Str,
-	_In_ size_t _SizeInChars)
+    _In_ size_t _SizeInChars)
 {
-	ATLMFC_CRT_ERRORCHECK(::_strupr_s(_Str, _SizeInChars));
+    ATLMFC_CRT_ERRORCHECK(::_strupr_s(_Str, _SizeInChars));
 }
 
 inline void __cdecl wcsupr_s(
-	_Inout_z_cap_(_SizeInChars) wchar_t * _Str,
+    _Inout_z_cap_(_SizeInChars) wchar_t * _Str,
-	_In_ size_t _SizeInChars)
+    _In_ size_t _SizeInChars)
 {
-	ATLMFC_CRT_ERRORCHECK(::_wcsupr_s(_Str, _SizeInChars));
+    ATLMFC_CRT_ERRORCHECK(::_wcsupr_s(_Str, _SizeInChars));
 }
 
 inline void __cdecl mbsupr_s(
-	_Inout_z_bytecap_(_SizeInChars) unsigned char * _Str,
+    _Inout_z_bytecap_(_SizeInChars) unsigned char * _Str,
-	_In_ size_t _SizeInChars)
+    _In_ size_t _SizeInChars)
 {
-	ATLMFC_CRT_ERRORCHECK(::_mbsupr_s(_Str, _SizeInChars));
+    ATLMFC_CRT_ERRORCHECK(::_mbsupr_s(_Str, _SizeInChars));
 }
 
 inline void __cdecl tcsupr_s(
-	_Inout_z_cap_(_SizeInChars) TCHAR * _Str,
+    _Inout_z_cap_(_SizeInChars) TCHAR * _Str,
-	_In_ size_t _SizeInChars)
+    _In_ size_t _SizeInChars)
 {
-	ATLMFC_CRT_ERRORCHECK(::_tcsupr_s(_Str, _SizeInChars));
+    ATLMFC_CRT_ERRORCHECK(::_tcsupr_s(_Str, _SizeInChars));
 }
 
 inline void __cdecl itoa_s(
-	_In_ int _Val,
+    _In_ int _Val,
-	_Out_z_cap_(_SizeInChars) char *_Buf,
+    _Out_z_cap_(_SizeInChars) char *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_itoa_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_itoa_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl itot_s(
-	_In_ int _Val,
+    _In_ int _Val,
-	_Out_z_cap_(_SizeInChars) TCHAR *_Buf,
+    _Out_z_cap_(_SizeInChars) TCHAR *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_itot_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_itot_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl ltoa_s(
-	_In_ long _Val,
+    _In_ long _Val,
-	_Out_z_cap_(_SizeInChars) char *_Buf,
+    _Out_z_cap_(_SizeInChars) char *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_ltoa_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_ltoa_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl ltot_s(
-	_In_ long _Val,
+    _In_ long _Val,
-	_Out_z_cap_(_SizeInChars) TCHAR *_Buf,
+    _Out_z_cap_(_SizeInChars) TCHAR *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_ltot_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_ltot_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl ultoa_s(
-	_In_ unsigned long _Val,
+    _In_ unsigned long _Val,
-	_Out_z_cap_(_SizeInChars) char *_Buf,
+    _Out_z_cap_(_SizeInChars) char *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_ultoa_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_ultoa_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl ultow_s(
-	_In_ unsigned long _Val,
+    _In_ unsigned long _Val,
-	_Out_z_cap_(_SizeInChars) wchar_t *_Buf,
+    _Out_z_cap_(_SizeInChars) wchar_t *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_ultow_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_ultow_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl ultot_s(
-	_In_ unsigned long _Val,
+    _In_ unsigned long _Val,
-	_Out_z_cap_(_SizeInChars) TCHAR *_Buf,
+    _Out_z_cap_(_SizeInChars) TCHAR *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_ultot_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_ultot_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl i64toa_s(
-	_In_ __int64 _Val,
+    _In_ __int64 _Val,
-	_Out_z_cap_(_SizeInChars) char *_Buf,
+    _Out_z_cap_(_SizeInChars) char *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_i64toa_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_i64toa_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl i64tow_s(
-	_In_ __int64 _Val,
+    _In_ __int64 _Val,
-	_Out_z_cap_(_SizeInChars) wchar_t *_Buf,
+    _Out_z_cap_(_SizeInChars) wchar_t *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_i64tow_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_i64tow_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl ui64toa_s(
-	_In_ unsigned __int64 _Val,
+    _In_ unsigned __int64 _Val,
-	_Out_z_cap_(_SizeInChars) char *_Buf,
+    _Out_z_cap_(_SizeInChars) char *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_ui64toa_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_ui64toa_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl ui64tow_s(
-	_In_ unsigned __int64 _Val,
+    _In_ unsigned __int64 _Val,
-	_Out_z_cap_(_SizeInChars) wchar_t *_Buf,
+    _Out_z_cap_(_SizeInChars) wchar_t *_Buf,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ int _Radix)
+    _In_ int _Radix)
 {
-	ATLMFC_CRT_ERRORCHECK(::_ui64tow_s(_Val, _Buf, _SizeInChars, _Radix));
+    ATLMFC_CRT_ERRORCHECK(::_ui64tow_s(_Val, _Buf, _SizeInChars, _Radix));
 }
 
 inline void __cdecl gcvt_s(
-	_Out_z_cap_(_SizeInChars) char *_Buffer,
+    _Out_z_cap_(_SizeInChars) char *_Buffer,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_ double _Value,
+    _In_ double _Value,
-	_In_ int _Ndec)
+    _In_ int _Ndec)
 {
-	ATLMFC_CRT_ERRORCHECK(::_gcvt_s(_Buffer, _SizeInChars, _Value, _Ndec));
+    ATLMFC_CRT_ERRORCHECK(::_gcvt_s(_Buffer, _SizeInChars, _Value, _Ndec));
 }
 
 inline void __cdecl tsplitpath_s(
-	_In_z_ const TCHAR *_Path,
+    _In_z_ const TCHAR *_Path,
-	_Out_opt_z_cap_(_Drive_len) TCHAR *_Drive,
+    _Out_opt_z_cap_(_Drive_len) TCHAR *_Drive,
-	_In_ size_t _Drive_len,
+    _In_ size_t _Drive_len,
-	_Out_opt_z_cap_(_Dir_len) TCHAR *_Dir,
+    _Out_opt_z_cap_(_Dir_len) TCHAR *_Dir,
-	_In_ size_t _Dir_len,
+    _In_ size_t _Dir_len,
-	_Out_opt_z_cap_(_Fname_len) TCHAR *_Fname,
+    _Out_opt_z_cap_(_Fname_len) TCHAR *_Fname,
-	_In_ size_t _Fname_len,
+    _In_ size_t _Fname_len,
-	_Out_opt_z_cap_(_Ext_len) TCHAR *_Ext,
+    _Out_opt_z_cap_(_Ext_len) TCHAR *_Ext,
-	_In_ size_t _Ext_len)
+    _In_ size_t _Ext_len)
 {
-	ATLMFC_CRT_ERRORCHECK(::_tsplitpath_s(_Path, _Drive, _Drive_len, _Dir, _Dir_len, _Fname, _Fname_len, _Ext, _Ext_len));
+    ATLMFC_CRT_ERRORCHECK(::_tsplitpath_s(_Path, _Drive, _Drive_len, _Dir, _Dir_len, _Fname, _Fname_len, _Ext, _Ext_len));
 }
 
 inline void __cdecl tmakepath_s(
-	_Out_z_cap_(_SizeInChars) TCHAR *_Path,
+    _Out_z_cap_(_SizeInChars) TCHAR *_Path,
-	_In_ size_t _SizeInChars,
+    _In_ size_t _SizeInChars,
-	_In_z_ const TCHAR *_Drive,
+    _In_z_ const TCHAR *_Drive,
-	_In_z_ const TCHAR *_Dir,
+    _In_z_ const TCHAR *_Dir,
-	_In_z_ const TCHAR *_Fname,
+    _In_z_ const TCHAR *_Fname,
-	_In_z_ const TCHAR *_Ext)
+    _In_z_ const TCHAR *_Ext)
 {
-	ATLMFC_CRT_ERRORCHECK(::_tmakepath_s(_Path, _SizeInChars, _Drive, _Dir, _Fname, _Ext));
+    ATLMFC_CRT_ERRORCHECK(::_tmakepath_s(_Path, _SizeInChars, _Drive, _Dir, _Fname, _Ext));
 }
 
 inline size_t __cdecl strnlen(
-	_In_z_count_(_Maxsize) const char *_Str,
+    _In_z_count_(_Maxsize) const char *_Str,
-	_In_ size_t _Maxsize)
+    _In_ size_t _Maxsize)
 {
-	return ::strnlen(_Str, _Maxsize);
+    return ::strnlen(_Str, _Maxsize);
 }
 
 inline size_t __cdecl wcsnlen(
-	_In_z_count_(_Maxsize) const wchar_t *_Wcs,
+    _In_z_count_(_Maxsize) const wchar_t *_Wcs,
-	_In_ size_t _Maxsize)
+    _In_ size_t _Maxsize)
 {
-	return ::wcsnlen(_Wcs, _Maxsize);
+    return ::wcsnlen(_Wcs, _Maxsize);
 }
 
 inline size_t __cdecl tcsnlen(
-	_In_z_count_(_Maxsize) const TCHAR *_Str,
+    _In_z_count_(_Maxsize) const TCHAR *_Str,
-	_In_ size_t _Maxsize)
+    _In_ size_t _Maxsize)
 {
-	return ::_tcsnlen(_Str, _Maxsize);
+    return ::_tcsnlen(_Str, _Maxsize);
 }
 
 inline int get_errno() throw()
 {
-	int nErrNo=0;
+    int nErrNo=0;
-	errno_t nErrCall=::_get_errno(&nErrNo);
+    errno_t nErrCall=::_get_errno(&nErrNo);
-	if(nErrCall)
+    if(nErrCall)
-	{
+    {
-		return nErrCall;
+        return nErrCall;
-	}
+    }
-	return nErrNo;
+    return nErrNo;
 }
 
 inline void set_errno(_In_ int _Value)
 {
-	ATLMFC_CRT_ERRORCHECK(::_set_errno(_Value));
+    ATLMFC_CRT_ERRORCHECK(::_set_errno(_Value));
 }
 
 } // namespace Checked

src/main/headers/atlcore.h

@@ -41,41 +41,41 @@ namespace ATL
 /////////////////////////////////////////////////////////////////////////////
 // Verify that a null-terminated string points to valid memory
 inline BOOL AtlIsValidString(
-	_In_z_count_(nMaxLength) LPCWSTR psz,
+    _In_z_count_(nMaxLength) LPCWSTR psz,
-	_In_ size_t nMaxLength = INT_MAX)
+    _In_ size_t nMaxLength = INT_MAX)
 {
-	(nMaxLength);
+    (nMaxLength);
-	return (psz != NULL);
+    return (psz != NULL);
 }
 
 // Verify that a null-terminated string points to valid memory
 inline BOOL AtlIsValidString(
-	_In_z_count_(nMaxLength) LPCSTR psz,
+    _In_z_count_(nMaxLength) LPCSTR psz,
-	_In_ size_t nMaxLength = UINT_MAX)
+    _In_ size_t nMaxLength = UINT_MAX)
 {
-	(nMaxLength);
+    (nMaxLength);
-	return (psz != NULL);
+    return (psz != NULL);
 }
 
 // Verify that a pointer points to valid memory
 inline BOOL AtlIsValidAddress(
-	_In_opt_bytecount_(nBytes) const void* p,
+    _In_opt_bytecount_(nBytes) const void* p,
-	_In_ size_t nBytes,
+    _In_ size_t nBytes,
-	_In_ BOOL bReadWrite = TRUE)
+    _In_ BOOL bReadWrite = TRUE)
 {
-	(bReadWrite);
+    (bReadWrite);
-	(nBytes);
+    (nBytes);
-	return (p != NULL);
+    return (p != NULL);
 }
 
 template<typename T>
 inline void AtlAssertValidObject(
-	_In_opt_ _Prepost_opt_bytecount_x_(sizeof(T)) const T *pOb)
+    _In_opt_ _Prepost_opt_bytecount_x_(sizeof(T)) const T *pOb)
 {
-	ATLASSERT(pOb);
+    ATLASSERT(pOb);
-	ATLASSERT(AtlIsValidAddress(pOb, sizeof(T)));
+    ATLASSERT(AtlIsValidAddress(pOb, sizeof(T)));
-	if(pOb)
+    if(pOb)
-		pOb->AssertValid();
+        pOb->AssertValid();
 }
 #ifdef _DEBUG
 #define ATLASSERT_VALID(x) ATL::AtlAssertValidObject(x)
@@ -87,143 +87,143 @@ inline void AtlAssertValidObject(
 class CComCriticalSection
 {
 public:
-	CComCriticalSection() throw()
+    CComCriticalSection() throw()
-	{
+    {
-		memset(&m_sec, 0, sizeof(CRITICAL_SECTION));
+        memset(&m_sec, 0, sizeof(CRITICAL_SECTION));
-	}
+    }
-	~CComCriticalSection()
+    ~CComCriticalSection()
-	{
+    {
-	}
+    }
-	HRESULT Lock() throw()
+    HRESULT Lock() throw()
-	{
+    {
-		EnterCriticalSection(&m_sec);
+        EnterCriticalSection(&m_sec);
-		return S_OK;
+        return S_OK;
-	}
+    }
-	HRESULT Unlock() throw()
+    HRESULT Unlock() throw()
-	{
+    {
-		LeaveCriticalSection(&m_sec);
+        LeaveCriticalSection(&m_sec);
-		return S_OK;
+        return S_OK;
-	}
+    }
-	HRESULT Init() throw()
+    HRESULT Init() throw()
-	{
+    {
-		HRESULT hRes = S_OK;
+        HRESULT hRes = S_OK;
 
-		if (!InitializeCriticalSectionAndSpinCount(&m_sec, 0))
+        if (!InitializeCriticalSectionAndSpinCount(&m_sec, 0))
-		{
+        {
-			hRes = HRESULT_FROM_WIN32(GetLastError());
+            hRes = HRESULT_FROM_WIN32(GetLastError());
-		}
+        }
 
-		return hRes;
+        return hRes;
-	}
+    }
 
-	HRESULT Term() throw()
+    HRESULT Term() throw()
-	{
+    {
-		DeleteCriticalSection(&m_sec);
+        DeleteCriticalSection(&m_sec);
-		return S_OK;
+        return S_OK;
-	}
+    }
-	CRITICAL_SECTION m_sec;
+    CRITICAL_SECTION m_sec;
 };
 
 class CComAutoCriticalSection :
-	public CComCriticalSection
+    public CComCriticalSection
 {
 public:
-	CComAutoCriticalSection()
+    CComAutoCriticalSection()
-	{
+    {
-		HRESULT hr = CComCriticalSection::Init();
+        HRESULT hr = CComCriticalSection::Init();
-		if (FAILED(hr))
+        if (FAILED(hr))
-			AtlThrow(hr);
+            AtlThrow(hr);
-	}
+    }
-	~CComAutoCriticalSection() throw()
+    ~CComAutoCriticalSection() throw()
-	{
+    {
-		CComCriticalSection::Term();
+        CComCriticalSection::Term();
-	}
+    }
 private :
-	HRESULT Init(); // Not implemented. CComAutoCriticalSection::Init should never be called
+    HRESULT Init(); // Not implemented. CComAutoCriticalSection::Init should never be called
-	HRESULT Term(); // Not implemented. CComAutoCriticalSection::Term should never be called
+    HRESULT Term(); // Not implemented. CComAutoCriticalSection::Term should never be called
 };
 
 class CComSafeDeleteCriticalSection :
-	public CComCriticalSection
+    public CComCriticalSection
 {
 public:
-	CComSafeDeleteCriticalSection(): m_bInitialized(false)
+    CComSafeDeleteCriticalSection(): m_bInitialized(false)
-	{
+    {
-	}
+    }
 
-	~CComSafeDeleteCriticalSection() throw()
+    ~CComSafeDeleteCriticalSection() throw()
-	{
+    {
-		if (!m_bInitialized)
+        if (!m_bInitialized)
-		{
+        {
-			return;
+            return;
-		}
+        }
-		m_bInitialized = false;
+        m_bInitialized = false;
-		CComCriticalSection::Term();
+        CComCriticalSection::Term();
-	}
+    }
 
-	HRESULT Init() throw()
+    HRESULT Init() throw()
-	{
+    {
-		ATLASSERT( !m_bInitialized );
+        ATLASSERT( !m_bInitialized );
-		HRESULT hr = CComCriticalSection::Init();
+        HRESULT hr = CComCriticalSection::Init();
-		if (SUCCEEDED(hr))
+        if (SUCCEEDED(hr))
-		{
+        {
-			m_bInitialized = true;
+            m_bInitialized = true;
-		}
+        }
-		return hr;
+        return hr;
-	}
+    }
 
-	HRESULT Term() throw()
+    HRESULT Term() throw()
-	{
+    {
-		if (!m_bInitialized)
+        if (!m_bInitialized)
-		{
+        {
-			return S_OK;
+            return S_OK;
-		}
+        }
-		m_bInitialized = false;
+        m_bInitialized = false;
-		return CComCriticalSection::Term();
+        return CComCriticalSection::Term();
-	}
+    }
 
-	HRESULT Lock()
+    HRESULT Lock()
-	{
+    {
-		// CComSafeDeleteCriticalSection::Init or CComAutoDeleteCriticalSection::Init
+        // CComSafeDeleteCriticalSection::Init or CComAutoDeleteCriticalSection::Init
-		// not called or failed.
+        // not called or failed.
-		// m_critsec member of CComObjectRootEx is now of type
+        // m_critsec member of CComObjectRootEx is now of type
-		// CComAutoDeleteCriticalSection. It has to be initialized
+        // CComAutoDeleteCriticalSection. It has to be initialized
-		// by calling CComObjectRootEx::_AtlInitialConstruct
+        // by calling CComObjectRootEx::_AtlInitialConstruct
-		ATLASSUME(m_bInitialized);
+        ATLASSUME(m_bInitialized);
-		return CComCriticalSection::Lock();
+        return CComCriticalSection::Lock();
-	}
+    }
 
 private:
-	bool m_bInitialized;
+    bool m_bInitialized;
 };
 
 class CComAutoDeleteCriticalSection :
-	public CComSafeDeleteCriticalSection
+    public CComSafeDeleteCriticalSection
 {
 private:
-	// CComAutoDeleteCriticalSection::Term should never be called
+    // CComAutoDeleteCriticalSection::Term should never be called
-	HRESULT Term() throw();
+    HRESULT Term() throw();
 };
 
 class CComFakeCriticalSection
 {
 public:
-	HRESULT Lock() throw()
+    HRESULT Lock() throw()
-	{
+    {
-		return S_OK;
+        return S_OK;
-	}
+    }
-	HRESULT Unlock() throw()
+    HRESULT Unlock() throw()
-	{
+    {
-		return S_OK;
+        return S_OK;
-	}
+    }
-	HRESULT Init() throw()
+    HRESULT Init() throw()
-	{
+    {
-		return S_OK;
+        return S_OK;
-	}
+    }
-	HRESULT Term() throw()
+    HRESULT Term() throw()
-	{
+    {
-		return S_OK;
+        return S_OK;
-	}
+    }
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -232,40 +232,40 @@ public:
 // Used by any project that uses ATL
 struct _ATL_BASE_MODULE70
 {
-	UINT cbSize;
+    UINT cbSize;
-	HINSTANCE m_hInst;
+    HINSTANCE m_hInst;
-	HINSTANCE m_hInstResource;
+    HINSTANCE m_hInstResource;
-	DWORD dwAtlBuildVer;
+    DWORD dwAtlBuildVer;
-	const GUID* pguidVer;
+    const GUID* pguidVer;
-	CComCriticalSection m_csResource;
+    CComCriticalSection m_csResource;
-	CSimpleArray<HINSTANCE> m_rgResourceInstance;
+    CSimpleArray<HINSTANCE> m_rgResourceInstance;
 };
 typedef _ATL_BASE_MODULE70 _ATL_BASE_MODULE;
 
 class CAtlBaseModule :
-	public _ATL_BASE_MODULE
+    public _ATL_BASE_MODULE
 {
 public :
-	static bool m_bInitFailed;
+    static bool m_bInitFailed;
-	CAtlBaseModule() throw();
+    CAtlBaseModule() throw();
-	~CAtlBaseModule() throw ();
+    ~CAtlBaseModule() throw ();
 
-	HINSTANCE GetModuleInstance() throw()
+    HINSTANCE GetModuleInstance() throw()
-	{
+    {
-		return m_hInst;
+        return m_hInst;
-	}
+    }
-	HINSTANCE GetResourceInstance() throw()
+    HINSTANCE GetResourceInstance() throw()
-	{
+    {
-		return m_hInstResource;
+        return m_hInstResource;
-	}
+    }
-	HINSTANCE SetResourceInstance(_In_ HINSTANCE hInst) throw()
+    HINSTANCE SetResourceInstance(_In_ HINSTANCE hInst) throw()
-	{
+    {
-		return static_cast< HINSTANCE >(InterlockedExchangePointer((void**)&m_hInstResource, hInst));
+        return static_cast< HINSTANCE >(InterlockedExchangePointer((void**)&m_hInstResource, hInst));
-	}
+    }
 
-	bool AddResourceInstance(_In_ HINSTANCE hInst) throw();
+    bool AddResourceInstance(_In_ HINSTANCE hInst) throw();
-	bool RemoveResourceInstance(_In_ HINSTANCE hInst) throw();
+    bool RemoveResourceInstance(_In_ HINSTANCE hInst) throw();
-	HINSTANCE GetHInstanceAt(_In_ int i) throw();
+    HINSTANCE GetHInstanceAt(_In_ int i) throw();
 };
 
 __declspec(selectany) bool CAtlBaseModule::m_bInitFailed = false;
@@ -276,199 +276,199 @@ extern CAtlBaseModule _AtlBaseModule;
 
 #pragma warning(push)
 #pragma warning(disable: 4200)
-	struct ATLSTRINGRESOURCEIMAGE
+    struct ATLSTRINGRESOURCEIMAGE
-	{
+    {
-		WORD nLength;
+        WORD nLength;
-		WCHAR achString[];
+        WCHAR achString[];
-	};
+    };
-#pragma warning(pop)	// C4200
+#pragma warning(pop)    // C4200
 
 inline const ATLSTRINGRESOURCEIMAGE* _AtlGetStringResourceImage(
-	_In_ HINSTANCE hInstance,
+    _In_ HINSTANCE hInstance,
-	_In_ HRSRC hResource,
+    _In_ HRSRC hResource,
-	_In_ UINT id) throw()
+    _In_ UINT id) throw()
 {
-	const ATLSTRINGRESOURCEIMAGE* pImage;
+    const ATLSTRINGRESOURCEIMAGE* pImage;
-	const ATLSTRINGRESOURCEIMAGE* pImageEnd;
+    const ATLSTRINGRESOURCEIMAGE* pImageEnd;
-	ULONG nResourceSize;
+    ULONG nResourceSize;
-	HGLOBAL hGlobal;
+    HGLOBAL hGlobal;
-	UINT iIndex;
+    UINT iIndex;
 
-	hGlobal = ::LoadResource( hInstance, hResource );
+    hGlobal = ::LoadResource( hInstance, hResource );
-	if( hGlobal == NULL )
+    if( hGlobal == NULL )
-	{
+    {
-		return( NULL );
+        return( NULL );
-	}
+    }
 
-	pImage = (const ATLSTRINGRESOURCEIMAGE*)::LockResource( hGlobal );
+    pImage = (const ATLSTRINGRESOURCEIMAGE*)::LockResource( hGlobal );
-	if( pImage == NULL )
+    if( pImage == NULL )
-	{
+    {
-		return( NULL );
+        return( NULL );
-	}
+    }
 
-	nResourceSize = ::SizeofResource( hInstance, hResource );
+    nResourceSize = ::SizeofResource( hInstance, hResource );
-	pImageEnd = (const ATLSTRINGRESOURCEIMAGE*)(LPBYTE( pImage )+nResourceSize);
+    pImageEnd = (const ATLSTRINGRESOURCEIMAGE*)(LPBYTE( pImage )+nResourceSize);
-	iIndex = id&0x000f;
+    iIndex = id&0x000f;
 
-	while( (iIndex > 0) && (pImage < pImageEnd) )
+    while( (iIndex > 0) && (pImage < pImageEnd) )
-	{
+    {
-		pImage = (const ATLSTRINGRESOURCEIMAGE*)(LPBYTE( pImage )+(sizeof( ATLSTRINGRESOURCEIMAGE )+(pImage->nLength*sizeof( WCHAR ))));
+        pImage = (const ATLSTRINGRESOURCEIMAGE*)(LPBYTE( pImage )+(sizeof( ATLSTRINGRESOURCEIMAGE )+(pImage->nLength*sizeof( WCHAR ))));
-		iIndex--;
+        iIndex--;
-	}
+    }
-	if( pImage >= pImageEnd )
+    if( pImage >= pImageEnd )
-	{
+    {
-		return( NULL );
+        return( NULL );
-	}
+    }
-	if( pImage->nLength == 0 )
+    if( pImage->nLength == 0 )
-	{
+    {
-		return( NULL );
+        return( NULL );
-	}
+    }
 
-	return( pImage );
+    return( pImage );
 }
 
 inline const ATLSTRINGRESOURCEIMAGE* AtlGetStringResourceImage(
-	_In_ HINSTANCE hInstance,
+    _In_ HINSTANCE hInstance,
-	_In_ UINT id) throw()
+    _In_ UINT id) throw()
 {
-	HRSRC hResource;
+    HRSRC hResource;
-	/*
+    /*
-		The and operation (& static_cast<WORD>(~0)) protects the expression from being greater
+        The and operation (& static_cast<WORD>(~0)) protects the expression from being greater
-		than WORD - this would cause a runtime error when the application is compiled with /RTCc flag.
+        than WORD - this would cause a runtime error when the application is compiled with /RTCc flag.
-	*/
+    */
-	hResource = ::FindResourceW(hInstance, MAKEINTRESOURCEW( (((id>>4)+1) & static_cast<WORD>(~0)) ), (LPWSTR) RT_STRING);
+    hResource = ::FindResourceW(hInstance, MAKEINTRESOURCEW( (((id>>4)+1) & static_cast<WORD>(~0)) ), (LPWSTR) RT_STRING);
-	if( hResource == NULL )
+    if( hResource == NULL )
-	{
+    {
-		return( NULL );
+        return( NULL );
-	}
+    }
 
-	return _AtlGetStringResourceImage( hInstance, hResource, id );
+    return _AtlGetStringResourceImage( hInstance, hResource, id );
 }
 
 inline const ATLSTRINGRESOURCEIMAGE* AtlGetStringResourceImage(
-	_In_ HINSTANCE hInstance,
+    _In_ HINSTANCE hInstance,
-	_In_ UINT id,
+    _In_ UINT id,
-	_In_ WORD wLanguage) throw()
+    _In_ WORD wLanguage) throw()
 {
-	HRSRC hResource;
+    HRSRC hResource;
-	/*
+    /*
-		The and operation (& static_cast<WORD>(~0)) protects the expression from being greater
+        The and operation (& static_cast<WORD>(~0)) protects the expression from being greater
-		than WORD - this would cause a runtime error when the application is compiled with /RTCc flag.
+        than WORD - this would cause a runtime error when the application is compiled with /RTCc flag.
-	*/
+    */
-	hResource = ::FindResourceExW(hInstance, (LPWSTR) RT_STRING, MAKEINTRESOURCEW( (((id>>4)+1) & static_cast<WORD>(~0)) ), wLanguage);
+    hResource = ::FindResourceExW(hInstance, (LPWSTR) RT_STRING, MAKEINTRESOURCEW( (((id>>4)+1) & static_cast<WORD>(~0)) ), wLanguage);
-	if( hResource == NULL )
+    if( hResource == NULL )
-	{
+    {
-		return( NULL );
+        return( NULL );
-	}
+    }
 
-	return _AtlGetStringResourceImage( hInstance, hResource, id );
+    return _AtlGetStringResourceImage( hInstance, hResource, id );
 }
 
 inline const ATLSTRINGRESOURCEIMAGE* AtlGetStringResourceImage(_In_ UINT id) throw()
 {
-	const ATLSTRINGRESOURCEIMAGE* p = NULL;
+    const ATLSTRINGRESOURCEIMAGE* p = NULL;
-	HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
+    HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
 
-	for (int i = 1; hInst != NULL && p == NULL; hInst = _AtlBaseModule.GetHInstanceAt(i++))
+    for (int i = 1; hInst != NULL && p == NULL; hInst = _AtlBaseModule.GetHInstanceAt(i++))
-	{
+    {
-		p = AtlGetStringResourceImage(hInst, id);
+        p = AtlGetStringResourceImage(hInst, id);
-	}
+    }
-	return p;
+    return p;
 }
 
 inline const ATLSTRINGRESOURCEIMAGE* AtlGetStringResourceImage(
-	_In_ UINT id,
+    _In_ UINT id,
-	_In_ WORD wLanguage) throw()
+    _In_ WORD wLanguage) throw()
 {
-	const ATLSTRINGRESOURCEIMAGE* p = NULL;
+    const ATLSTRINGRESOURCEIMAGE* p = NULL;
-	HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
+    HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
 
-	for (int i = 1; hInst != NULL && p == NULL; hInst = _AtlBaseModule.GetHInstanceAt(i++))
+    for (int i = 1; hInst != NULL && p == NULL; hInst = _AtlBaseModule.GetHInstanceAt(i++))
-	{
+    {
-		p = AtlGetStringResourceImage(hInst, id, wLanguage);
+        p = AtlGetStringResourceImage(hInst, id, wLanguage);
-	}
+    }
-	return p;
+    return p;
 }
 
 inline int AtlLoadString(
-	_In_ UINT nID,
+    _In_ UINT nID,
-	_Out_z_cap_post_count_(nBufferMax, return + 1) LPTSTR lpBuffer,
+    _Out_z_cap_post_count_(nBufferMax, return + 1) LPTSTR lpBuffer,
-	_In_ int nBufferMax) throw()
+    _In_ int nBufferMax) throw()
 {
-	HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
+    HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
-	int nRet = 0;
+    int nRet = 0;
 
-	for (int i = 1; hInst != NULL && nRet == 0; hInst = _AtlBaseModule.GetHInstanceAt(i++))
+    for (int i = 1; hInst != NULL && nRet == 0; hInst = _AtlBaseModule.GetHInstanceAt(i++))
-	{
+    {
-		nRet = LoadString(hInst, nID, lpBuffer, nBufferMax);
+        nRet = LoadString(hInst, nID, lpBuffer, nBufferMax);
-	}
+    }
-	return nRet;
+    return nRet;
 }
 
 inline HINSTANCE AtlFindResourceInstance(
-	_In_z_ LPCTSTR lpName,
+    _In_z_ LPCTSTR lpName,
-	_In_z_ LPCTSTR lpType,
+    _In_z_ LPCTSTR lpType,
-	_In_ WORD wLanguage = 0) throw()
+    _In_ WORD wLanguage = 0) throw()
 {
-	ATLASSERT(lpType != RT_STRING);	// Call AtlFindStringResourceInstance to find the string
+    ATLASSERT(lpType != RT_STRING);    // Call AtlFindStringResourceInstance to find the string
-	if (lpType == RT_STRING)
+    if (lpType == RT_STRING)
-		return NULL;
+        return NULL;
 
-	if (ATL_IS_INTRESOURCE(lpType))
+    if (ATL_IS_INTRESOURCE(lpType))
-	{
+    {
-		/* Prefast false warnings caused by bad-shaped definition of MAKEINTRESOURCE macro from PSDK */
+        /* Prefast false warnings caused by bad-shaped definition of MAKEINTRESOURCE macro from PSDK */
-		if (lpType == ATL_RT_ICON)
+        if (lpType == ATL_RT_ICON)
-		{
+        {
-			lpType = ATL_RT_GROUP_ICON;
+            lpType = ATL_RT_GROUP_ICON;
-		}
+        }
-		else if (lpType == ATL_RT_CURSOR)
+        else if (lpType == ATL_RT_CURSOR)
-		{
+        {
-			lpType = ATL_RT_GROUP_CURSOR;
+            lpType = ATL_RT_GROUP_CURSOR;
-		}
+        }
-	}
+    }
 
-	HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
+    HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
-	HRSRC hResource = NULL;
+    HRSRC hResource = NULL;
 
-	for (int i = 1; hInst != NULL; hInst = _AtlBaseModule.GetHInstanceAt(i++))
+    for (int i = 1; hInst != NULL; hInst = _AtlBaseModule.GetHInstanceAt(i++))
-	{
+    {
-		hResource = ::FindResourceEx(hInst, lpType, lpName, wLanguage);
+        hResource = ::FindResourceEx(hInst, lpType, lpName, wLanguage);
-		if (hResource != NULL)
+        if (hResource != NULL)
-		{
+        {
-			return hInst;
+            return hInst;
-		}
+        }
-	}
+    }
 
-	return NULL;
+    return NULL;
 }
 
 inline HINSTANCE AtlFindResourceInstance(
-	_In_ UINT nID,
+    _In_ UINT nID,
-	_In_z_ LPCTSTR lpType,
+    _In_z_ LPCTSTR lpType,
-	_In_ WORD wLanguage = 0) throw()
+    _In_ WORD wLanguage = 0) throw()
 {
-	/*
+    /*
-		The and operation (& static_cast<WORD>(~0)) protects the expression from being greater
+        The and operation (& static_cast<WORD>(~0)) protects the expression from being greater
-		than WORD - this would cause a runtime error when the application is compiled with /RTCc flag.
+        than WORD - this would cause a runtime error when the application is compiled with /RTCc flag.
-	*/
+    */
-	return AtlFindResourceInstance(MAKEINTRESOURCE(nID & static_cast<WORD>(~0)), lpType, wLanguage);
+    return AtlFindResourceInstance(MAKEINTRESOURCE(nID & static_cast<WORD>(~0)), lpType, wLanguage);
 }
 
 inline HINSTANCE AtlFindStringResourceInstance(
-	_In_ UINT nID,
+    _In_ UINT nID,
-	_In_ WORD wLanguage = 0) throw()
+    _In_ WORD wLanguage = 0) throw()
 {
-	const ATLSTRINGRESOURCEIMAGE* p = NULL;
+    const ATLSTRINGRESOURCEIMAGE* p = NULL;
-	HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
+    HINSTANCE hInst = _AtlBaseModule.GetHInstanceAt(0);
 
-	for (int i = 1; hInst != NULL && p == NULL; hInst = _AtlBaseModule.GetHInstanceAt(i++))
+    for (int i = 1; hInst != NULL && p == NULL; hInst = _AtlBaseModule.GetHInstanceAt(i++))
-	{
+    {
-		p = AtlGetStringResourceImage(hInst, nID, wLanguage);
+        p = AtlGetStringResourceImage(hInst, nID, wLanguage);
-		if (p != NULL)
+        if (p != NULL)
-			return hInst;
+            return hInst;
-	}
+    }
 
-	return NULL;
+    return NULL;
 }
 
 /*
@@ -505,39 +505,39 @@ inline HRESULT AtlSafeArrayGetActualVartype(
 template <typename _CharType>
 inline _CharType* AtlCharNext(_In_ const _CharType* p) throw()
 {
-	ATLASSUME(p != NULL);	// Too expensive to check separately here
+    ATLASSUME(p != NULL);    // Too expensive to check separately here
-	if (*p == '\0')  // ::CharNextA won't increment if we're at a \0 already
+    if (*p == '\0')  // ::CharNextA won't increment if we're at a \0 already
-		return const_cast<_CharType*>(p+1);
+        return const_cast<_CharType*>(p+1);
-	else
+    else
-		return ::CharNextA(p);
+        return ::CharNextA(p);
 }
 
 template <>
 inline wchar_t* AtlCharNext<wchar_t>(_In_ const wchar_t* p) throw()
 {
-	return const_cast< wchar_t* >( p+1 );
+    return const_cast< wchar_t* >( p+1 );
 }
 template<typename CharType>
 inline const CharType* AtlstrchrT(
-	_In_z_ const CharType* p,
+    _In_z_ const CharType* p,
-	_In_ CharType ch) throw()
+    _In_ CharType ch) throw()
 {
-	ATLASSERT(p != NULL);
+    ATLASSERT(p != NULL);
-	if(p==NULL)
+    if(p==NULL)
-	{
+    {
-		return NULL;
+        return NULL;
-	}
+    }
-	while( *p != 0 )
+    while( *p != 0 )
-	{
+    {
-		if (*p == ch)
+        if (*p == ch)
-		{
+        {
-			return p;
+            return p;
-		}
+        }
-		p = AtlCharNext(p);
+        p = AtlCharNext(p);
-	}
+    }
-	//strchr for '\0' should succeed - the while loop terminates
+    //strchr for '\0' should succeed - the while loop terminates
-	//*p == 0, but ch also == 0, so NULL terminator address is returned
+    //*p == 0, but ch also == 0, so NULL terminator address is returned
-	return (*p == ch) ? p : NULL;
+    return (*p == ch) ? p : NULL;
 }
 //Ansi and Unicode versions of printf, used with templated CharType trait classes.
 #pragma warning(push)
@@ -545,12 +545,12 @@ inline const CharType* AtlstrchrT(
 template<typename CharType>
 inline int AtlprintfT(_In_z_ _Printf_format_string_ const CharType* pszFormat,...) throw()
 {
-	int retval=0;
+    int retval=0;
-	va_list argList;
+    va_list argList;
-	va_start( argList, pszFormat );
+    va_start( argList, pszFormat );
-	retval=vprintf(pszFormat,argList);
+    retval=vprintf(pszFormat,argList);
-	va_end( argList );
+    va_end( argList );
-	return retval;
+    return retval;
 }
 #pragma warning(pop)
 
@@ -559,43 +559,43 @@ inline int AtlprintfT(_In_z_ _Printf_format_string_ const CharType* pszFormat,..
 template<>
 inline int AtlprintfT(_In_z_ _Printf_format_string_ const wchar_t* pszFormat,... ) throw()
 {
-	int retval=0;
+    int retval=0;
-	va_list argList;
+    va_list argList;
-	va_start( argList, pszFormat );
+    va_start( argList, pszFormat );
-	retval=vwprintf(pszFormat,	argList);
+    retval=vwprintf(pszFormat,    argList);
-	va_end( argList );
+    va_end( argList );
-	return retval;
+    return retval;
 }
 #pragma warning(pop)
 
 inline BOOL AtlConvertSystemTimeToVariantTime(
-	_In_ const SYSTEMTIME& systimeSrc,
+    _In_ const SYSTEMTIME& systimeSrc,
-	_Out_ double* pVarDtTm)
+    _Out_ double* pVarDtTm)
 {
-	ATLENSURE(pVarDtTm!=NULL);
+    ATLENSURE(pVarDtTm!=NULL);
-	//Convert using ::SystemTimeToVariantTime and store the result in pVarDtTm then
+    //Convert using ::SystemTimeToVariantTime and store the result in pVarDtTm then
-	//convert variant time back to system time and compare to original system time.
+    //convert variant time back to system time and compare to original system time.
-	BOOL ok = ::SystemTimeToVariantTime(const_cast<SYSTEMTIME*>(&systimeSrc), pVarDtTm);
+    BOOL ok = ::SystemTimeToVariantTime(const_cast<SYSTEMTIME*>(&systimeSrc), pVarDtTm);
-	SYSTEMTIME sysTime;
+    SYSTEMTIME sysTime;
-	::ZeroMemory(&sysTime, sizeof(SYSTEMTIME));
+    ::ZeroMemory(&sysTime, sizeof(SYSTEMTIME));
 
-	ok = ok && ::VariantTimeToSystemTime(*pVarDtTm, &sysTime);
+    ok = ok && ::VariantTimeToSystemTime(*pVarDtTm, &sysTime);
-	ok = ok && (systimeSrc.wYear == sysTime.wYear &&
+    ok = ok && (systimeSrc.wYear == sysTime.wYear &&
-			systimeSrc.wMonth == sysTime.wMonth &&
+            systimeSrc.wMonth == sysTime.wMonth &&
-			systimeSrc.wDay == sysTime.wDay &&
+            systimeSrc.wDay == sysTime.wDay &&
-			systimeSrc.wHour == sysTime.wHour &&
+            systimeSrc.wHour == sysTime.wHour &&
-			systimeSrc.wMinute == sysTime.wMinute &&
+            systimeSrc.wMinute == sysTime.wMinute &&
-			systimeSrc.wSecond == sysTime.wSecond);
+            systimeSrc.wSecond == sysTime.wSecond);
 
-	return ok;
+    return ok;
 }
 /////////////////////////////////////////////////////////////////////////////
 
-}	// namespace ATL
+}    // namespace ATL
 #pragma pack(pop)
 
 #ifdef _ATL_ALL_WARNINGS
 #pragma warning( pop )
 #endif
 
-#endif	// __ATLCORE_H__
+#endif    // __ATLCORE_H__

src/main/headers/atldef.h

@@ -13,7 +13,7 @@
 
 #pragma once
 
-#pragma warning(disable : 4619)	// there is no warning number
+#pragma warning(disable : 4619)    // there is no warning number
 
 #include <atlrc.h>
 #include <errno.h>
@@ -33,11 +33,11 @@
 #ifndef RC_INVOKED
 
 #ifndef __cplusplus
-	#error ATL requires C++ compilation (use a .cpp suffix)
+    #error ATL requires C++ compilation (use a .cpp suffix)
 #endif
 
 #ifdef UNDER_CE
-	#error This version of ATL is not currently supported for CE. Look for the CE specific version.
+    #error This version of ATL is not currently supported for CE. Look for the CE specific version.
 #endif
 
 // If you are mixing compilation units that are built as
@@ -47,7 +47,7 @@
 #if !defined(_ATL_MIXED)
 namespace Inconsistent_definition_of_symbol__ATL_MIXED
 {
-	struct _Please_define_it_the_same_throughout_your_project { };
+    struct _Please_define_it_the_same_throughout_your_project { };
 }
 #else
 namespace Inconsistent_definition_of_symbol__ATL_MIXED
@@ -57,28 +57,28 @@ namespace Inconsistent_definition_of_symbol__ATL_MIXED
 #else
 #pragma comment(linker, "/include:??3@YAXPEAX@Z")
 #endif
-	struct _Please_define_it_the_same_throughout_your_project { virtual void one(){} };
+    struct _Please_define_it_the_same_throughout_your_project { virtual void one(){} };
 }
 #endif
 namespace Inconsistent_definition_of_symbol__ATL_MIXED
 {
-	__declspec(selectany) _Please_define_it_the_same_throughout_your_project clash = _Please_define_it_the_same_throughout_your_project ();
+    __declspec(selectany) _Please_define_it_the_same_throughout_your_project clash = _Please_define_it_the_same_throughout_your_project ();
 }
 
 #if !defined(_ATL_MIXED)
 namespace Define_the_symbol__ATL_MIXED
 {
 #if defined(_M_CEE)
-	struct Thank_you { };
+    struct Thank_you { };
 #else
 #ifdef _M_IX86
 #pragma comment(linker, "/include:??3@YAXPAX@Z")
 #else
 #pragma comment(linker, "/include:??3@YAXPEAX@Z")
 #endif
-	struct Thank_you { virtual void one(){} };
+    struct Thank_you { virtual void one(){} };
 #endif
-	__declspec(selectany) Thank_you clash = Thank_you();
+    __declspec(selectany) Thank_you clash = Thank_you();
 }
 #endif
 
@@ -113,7 +113,7 @@ namespace Define_the_symbol__ATL_MIXED
 #if defined(_PREFAST_) && (_MSC_VER < 1600)
 #define ATLSTATIC_ASSERT(expr, comment)
 #else 
-#define ATLSTATIC_ASSERT(expr, comment)		static_assert(expr, comment)
+#define ATLSTATIC_ASSERT(expr, comment)        static_assert(expr, comment)
 #endif
 
 #ifdef _WIN64
@@ -184,19 +184,19 @@ Sometimes we have code like
 
 HRESULT ComMethod(void)
 {
-	ATLASSUME(m_pFoo);
+    ATLASSUME(m_pFoo);
-	return m_pFoo->Method();
+    return m_pFoo->Method();
 }
 
 We could add
-	if(!m_pFoo) return E_POINTER;
+    if(!m_pFoo) return E_POINTER;
 
 But this is very unlikely to help, since it removes the ability of the developer to debug this problem if it's seen in a retail
 build of the application. 
 
 We could try something more severe
 
-	if(!m_pFoo) terminate(); // or your favourite shutdown function
+    if(!m_pFoo) terminate(); // or your favourite shutdown function
 
 This would ensure good reporting (because VC8 terminate generates a Windows Error Report and crash dump), but hardly seems a big win 
 over the previous crash.
@@ -233,9 +233,9 @@ So we've done a broad replace of all the member-related ATLASSERT to ATLASSUME.
 #ifndef ATLENSURE_THROW
 #define ATLENSURE_THROW(expr, hr)          \
 do {                                       \
-	int __atl_condVal=!!(expr);            \
+    int __atl_condVal=!!(expr);            \
-	ATLASSUME(__atl_condVal);              \
+    ATLASSUME(__atl_condVal);              \
-	if(!(__atl_condVal)) AtlThrow(hr);     \
+    if(!(__atl_condVal)) AtlThrow(hr);     \
 } while (0)
 #endif // ATLENSURE_THROW
 
@@ -251,9 +251,9 @@ do {                                       \
 #ifndef ATLENSURE_RETURN_VAL
 #define ATLENSURE_RETURN_VAL(expr, val)        \
 do {                                           \
-	int __atl_condVal=!!(expr);                \
+    int __atl_condVal=!!(expr);                \
-	ATLASSERT(__atl_condVal);                  \
+    ATLASSERT(__atl_condVal);                  \
-	if(!(__atl_condVal)) return val;           \
+    if(!(__atl_condVal)) return val;           \
 } while (0) 
 #endif // ATLENSURE_RETURN_VAL
 
@@ -278,17 +278,17 @@ ATLENSURE_RETURN_HR is HRESULT-specific, though currently the same as _VAL
 #ifndef ATL_CRT_ERRORCHECK_SPRINTF
 #define ATL_CRT_ERRORCHECK_SPRINTF(expr) \
 do { \
-	errno_t _saveErrno = errno; \
+    errno_t _saveErrno = errno; \
-	errno = 0; \
+    errno = 0; \
-	(expr); \
+    (expr); \
-	if(0 != errno) \
+    if(0 != errno) \
-	{ \
+    { \
-		AtlCrtErrorCheck(errno); \
+        AtlCrtErrorCheck(errno); \
-	} \
+    } \
-	else \
+    else \
-	{ \
+    { \
-		errno = _saveErrno; \
+        errno = _saveErrno; \
-	} \
+    } \
 } while (0)
 #endif // ATL_CRT_ERRORCHECK_SPRINTF
 
@@ -383,33 +383,33 @@ do { \
 #endif
 
 #if defined(_ATL_DLL)
-	#define ATLAPI extern "C" HRESULT __declspec(dllimport) __stdcall
+    #define ATLAPI extern "C" HRESULT __declspec(dllimport) __stdcall
-	#define ATLAPI_(x) extern "C" __declspec(dllimport) x __stdcall
+    #define ATLAPI_(x) extern "C" __declspec(dllimport) x __stdcall
-	#define ATLINLINE
+    #define ATLINLINE
-	#define ATLAPIINL extern "C" inline HRESULT __stdcall
+    #define ATLAPIINL extern "C" inline HRESULT __stdcall
-	#define ATLAPIINL_(x) extern "C" inline x __stdcall
+    #define ATLAPIINL_(x) extern "C" inline x __stdcall
 #elif defined(_ATL_DLL_IMPL)
-	#define ATLAPI extern "C" inline HRESULT __stdcall
+    #define ATLAPI extern "C" inline HRESULT __stdcall
-	#define ATLAPI_(x) extern "C" inline x __stdcall
+    #define ATLAPI_(x) extern "C" inline x __stdcall
-	#define ATLAPIINL ATLAPI
+    #define ATLAPIINL ATLAPI
-	#define ATLAPIINL_(x) ATLAPI_(x)
+    #define ATLAPIINL_(x) ATLAPI_(x)
-	#define ATLINLINE
+    #define ATLINLINE
 #else
-	#define ATLAPI __declspec(nothrow) HRESULT __stdcall
+    #define ATLAPI __declspec(nothrow) HRESULT __stdcall
-	#define ATLAPI_(x) __declspec(nothrow) x __stdcall
+    #define ATLAPI_(x) __declspec(nothrow) x __stdcall
-	#define ATLAPIINL ATLAPI
+    #define ATLAPIINL ATLAPI
-	#define ATLAPIINL_(x) ATLAPI_(x)
+    #define ATLAPIINL_(x) ATLAPI_(x)
-	#define ATLINLINE inline
+    #define ATLINLINE inline
 #endif
 
 #ifdef _ATL_NO_EXCEPTIONS
-	#ifdef _AFX
+    #ifdef _AFX
-	// #error MFC projects cannot define _ATL_NO_EXCEPTIONS
+    // #error MFC projects cannot define _ATL_NO_EXCEPTIONS
-	#endif
+    #endif
 #else
-	#ifndef _CPPUNWIND
+    #ifndef _CPPUNWIND
-	#define _ATL_NO_EXCEPTIONS
+    #define _ATL_NO_EXCEPTIONS
-	#endif
+    #endif
 #endif
 
 #ifdef _CPPUNWIND
@@ -421,9 +421,9 @@ do { \
 #else
 /* prefast noise VSW 489981 */
 #define ATLTRYALLOC(x) __pragma(warning(push)) __pragma(warning(disable: 4571)) try{x;} catch(...) {} __pragma(warning(pop))
-#endif	//__AFX
+#endif    //__AFX
 
-#endif	//ATLTRYALLOC
+#endif    //ATLTRYALLOC
 
 // If you define _ATLTRY before including this file, then
 // you should define _ATLCATCH and _ATLRETHROW as well.
@@ -444,7 +444,7 @@ do { \
 #endif
 
 #define _ATLRETHROW throw
-#endif	// _ATLTRY
+#endif    // _ATLTRY
 
 /* 
 COM functions should not throw. Which means we should protect their callers from C++ exceptions leaking out. These macros
@@ -454,38 +454,38 @@ this end
  
 #ifndef _ATL_COM_BEGIN 
 #define _ATL_COM_BEGIN \
-	HRESULT __hrAtlComMethod=S_OK; \
+    HRESULT __hrAtlComMethod=S_OK; \
-	try \
+    try \
-	{
+    {
 #endif
 
 #ifdef _AFX
 /* Nice to do something more complex here in future to translate an MFC exception to a better HR */
 #define _AFX_COM_END_PART \
-	catch(CException *e) \
+    catch(CException *e) \
-	{ \
+    { \
-		if(e) \
+        if(e) \
-		{ \
+        { \
-			e->Delete(); \
+            e->Delete(); \
-		} \
+        } \
-		__hrAtlComMethod=E_FAIL; \
+        __hrAtlComMethod=E_FAIL; \
-	}
+    }
 #else
 #define _AFX_COM_END_PART \
-	catch(CAtlException e) \
+    catch(CAtlException e) \
-	{ \
+    { \
-		__hrAtlComMethod=e.m_hr; \
+        __hrAtlComMethod=e.m_hr; \
-	}
+    }
 #endif
 
 #ifndef _ATL_COM_END 
 #define _ATL_COM_END \
-	_AFX_COM_END_PART \
+    _AFX_COM_END_PART \
-	catch(...) \
+    catch(...) \
-	{ \
+    { \
-		__hrAtlComMethod=E_FAIL; \
+        __hrAtlComMethod=E_FAIL; \
-	} \
+    } \
-	return hr; 
+    return hr; 
 #endif
 
 
@@ -494,7 +494,7 @@ this end
 
 #ifndef ATLTRYALLOC
 #define ATLTRYALLOC(x) x;
-#endif	//ATLTRYALLOC
+#endif    //ATLTRYALLOC
 
 // if _ATLTRY is defined before including this file then 
 // _ATLCATCH and _ATLRETHROW should be defined as well.
@@ -504,13 +504,13 @@ this end
 #define _ATLCATCHALL() __pragma(warning(push)) __pragma(warning(disable: 4127)) if( false ) __pragma(warning(pop))
 #define _ATLDELETEEXCEPTION(e)
 #define _ATLRETHROW
-#endif	// _ATLTRY
+#endif    // _ATLTRY
 
-#endif	//_CPPUNWIND
+#endif    //_CPPUNWIND
 
 #ifndef ATLTRY
 #define ATLTRY(x) ATLTRYALLOC(x)
-#endif	//ATLTRY
+#endif    //ATLTRY
 
 #define offsetofclass(base, derived) ((DWORD_PTR)(static_cast<base*>((derived*)_ATL_PACKING))-_ATL_PACKING)
 
@@ -558,19 +558,19 @@ this end
 #ifndef NOMCX
 #define NOMCX
 #endif
-#endif	// ATL_NO_LEAN_AND_MEAN
+#endif    // ATL_NO_LEAN_AND_MEAN
 
 #ifdef NOSERVICE
 #ifndef _ATL_NO_SERVICE
 #define _ATL_NO_SERVICE
-#endif	// _ATL_NO_SERVICE
+#endif    // _ATL_NO_SERVICE
 #else
 #ifdef _ATL_NO_SERVICE
 #ifndef NOSERVICE
 #define NOSERVICE
-#endif	// NOSERVICE
+#endif    // NOSERVICE
-#endif	// _ATL_NO_SERVICE
+#endif    // _ATL_NO_SERVICE
-#endif	// NOSERVICE
+#endif    // NOSERVICE
 
 #include <malloc.h>
 #ifdef _DEBUG
@@ -580,15 +580,15 @@ this end
 // Warning: if you define the above symbol, you will have
 // to provide your own definition of the ATLASSERT(x) macro
 // in order to compile ATL
-	#include <crtdbg.h>
+    #include <crtdbg.h>
 #endif
 
 #endif // RC_INVOKED
 
 // Note : we can not use macros to generate the window class names because it
 //        will require nested macros. rc.exe does not handle nested macros.
-// #define ATLAXWIN_CLASS	_ATL_STRINGIZE(_ATL_APPEND(AtlAxWin, _ATL_FILENAME_VER_NUM))
+// #define ATLAXWIN_CLASS    _ATL_STRINGIZE(_ATL_APPEND(AtlAxWin, _ATL_FILENAME_VER_NUM))
-// #define ATLAXWINLIC_CLASS	_ATL_STRINGIZE(_ATL_APPEND(AtlAxWinLic, _ATL_FILENAME_VER_NUM))
+// #define ATLAXWINLIC_CLASS    _ATL_STRINGIZE(_ATL_APPEND(AtlAxWinLic, _ATL_FILENAME_VER_NUM))
 
 #define ATLAXWIN_CLASS "AtlAxWin100"
 #define ATLAXWINLIC_CLASS "AtlAxWinLic100"
@@ -622,10 +622,10 @@ that we consider it dangerous to even throw an exception
 #else
 #if !defined(__MINGW32__)
 #define PTM_WARNING_DISABLE \
-	__pragma(warning( push )) \
+    __pragma(warning( push )) \
-	__pragma(warning( disable : 4867 ))
+    __pragma(warning( disable : 4867 ))
 #define PTM_WARNING_RESTORE \
-	__pragma(warning( pop ))
+    __pragma(warning( pop ))
 #else
 #define PTM_WARNING_DISABLE
 #define PTM_WARNING_RESTORE
@@ -695,13 +695,13 @@ that we consider it dangerous to even throw an exception
 #define ATLPREFAST_SUPPRESS(x)
 #define ATLPREFAST_UNSUPPRESS()
 #endif
-	
+    
 #ifndef _FormatMessage_format_string_
 #define _FormatMessage_format_string_
 #endif
-	
+    
 /* 
-	Helper functions for SAL annotation
+    Helper functions for SAL annotation
 */
 namespace ATL {
 

src/main/headers/atlexcept.h

@@ -27,32 +27,32 @@ namespace ATL
 // Exception raise (for functions that cannot return an error code)
 
 inline void __declspec(noreturn) _AtlRaiseException(
-	_In_ DWORD dwExceptionCode,
+    _In_ DWORD dwExceptionCode,
-	_In_ DWORD dwExceptionFlags = EXCEPTION_NONCONTINUABLE)
+    _In_ DWORD dwExceptionFlags = EXCEPTION_NONCONTINUABLE)
 {
-	RaiseException( dwExceptionCode, dwExceptionFlags, 0, NULL );
+    RaiseException( dwExceptionCode, dwExceptionFlags, 0, NULL );
 }
 
 class CAtlException
 {
 public:
-	CAtlException() throw() :
+    CAtlException() throw() :
-		m_hr( E_FAIL )
+        m_hr( E_FAIL )
-	{
+    {
-	}
+    }
 
-	CAtlException(_In_ HRESULT hr) throw() :
+    CAtlException(_In_ HRESULT hr) throw() :
-		m_hr( hr )
+        m_hr( hr )
-	{
+    {
-	}
+    }
 
-	operator HRESULT() const throw()
+    operator HRESULT() const throw()
-	{
+    {
-		return( m_hr );
+        return( m_hr );
-	}
+    }
 
 public:
-	HRESULT m_hr;
+    HRESULT m_hr;
 };
 
 #ifndef ATL_NOINLINE
@@ -73,15 +73,15 @@ public:
 #else
 ATL_NOINLINE __declspec(noreturn) inline void WINAPI AtlThrowImpl(_In_ HRESULT hr)
 {
-	throw CAtlException( hr );
+    throw CAtlException( hr );
 }
 #endif
 
 // Throw a CAtlException corresponding to the result of ::GetLastError
 ATL_NOINLINE __declspec(noreturn) inline void WINAPI AtlThrowLastWin32()
 {
-	DWORD dwError = ::GetLastError();
+    DWORD dwError = ::GetLastError();
-	AtlThrowImpl( HRESULT_FROM_WIN32( dwError ) );
+    AtlThrowImpl( HRESULT_FROM_WIN32( dwError ) );
 }
 
 #else  // no exception handling
@@ -91,25 +91,25 @@ ATL_NOINLINE __declspec(noreturn) inline void WINAPI AtlThrowLastWin32()
 
 ATL_NOINLINE inline void WINAPI AtlThrowImpl(_In_ HRESULT hr)
 {
-	ATLASSERT( false );
+    ATLASSERT( false );
-	DWORD dwExceptionCode;
+    DWORD dwExceptionCode;
-	switch(hr)
+    switch(hr)
-	{
+    {
-	case E_OUTOFMEMORY:
+    case E_OUTOFMEMORY:
-		dwExceptionCode = STATUS_NO_MEMORY;
+        dwExceptionCode = STATUS_NO_MEMORY;
-		break;
+        break;
-	default:
+    default:
-		dwExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION;
+        dwExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION;
-	}
+    }
-	_AtlRaiseException((DWORD)dwExceptionCode);
+    _AtlRaiseException((DWORD)dwExceptionCode);
 }
 #endif
 
 // Throw a CAtlException corresponding to the result of ::GetLastError
 ATL_NOINLINE inline void WINAPI AtlThrowLastWin32()
 {
-	DWORD dwError = ::GetLastError();
+    DWORD dwError = ::GetLastError();
-	AtlThrowImpl( HRESULT_FROM_WIN32( dwError ) );
+    AtlThrowImpl( HRESULT_FROM_WIN32( dwError ) );
 }
 
 #endif  // no exception handling

src/main/headers/atlsimpcoll.h

@@ -49,64 +49,64 @@ template <class T>
 class CSimpleArrayEqualHelper
 {
 public:
-	static bool IsEqual(
+    static bool IsEqual(
-		_In_ const T& t1,
+        _In_ const T& t1,
-		_In_ const T& t2)
+        _In_ const T& t2)
-	{
+    {
-		return (t1 == t2);
+        return (t1 == t2);
-	}
+    }
 };
 
 template <class T>
 class CSimpleArrayEqualHelperFalse
 {
 public:
-	static bool IsEqual(
+    static bool IsEqual(
-		_In_ const T&,
+        _In_ const T&,
-		_In_ const T&)
+        _In_ const T&)
-	{
+    {
-		ATLASSERT(false);
+        ATLASSERT(false);
-		return false;
+        return false;
-	}
+    }
 };
 
 template <class TKey, class TVal>
 class CSimpleMapEqualHelper
 {
 public:
-	static bool IsEqualKey(
+    static bool IsEqualKey(
-		_In_ const TKey& k1,
+        _In_ const TKey& k1,
-		_In_ const TKey& k2)
+        _In_ const TKey& k2)
-	{
+    {
-		return CSimpleArrayEqualHelper<TKey>::IsEqual(k1, k2);
+        return CSimpleArrayEqualHelper<TKey>::IsEqual(k1, k2);
-	}
+    }
 
-	static bool IsEqualValue(
+    static bool IsEqualValue(
-		_In_ const TVal& v1,
+        _In_ const TVal& v1,
-		_In_ const TVal& v2)
+        _In_ const TVal& v2)
-	{
+    {
-		return CSimpleArrayEqualHelper<TVal>::IsEqual(v1, v2);
+        return CSimpleArrayEqualHelper<TVal>::IsEqual(v1, v2);
-	}
+    }
 };
 
 template <class TKey, class TVal>
 class CSimpleMapEqualHelperFalse
 {
 public:
-	static bool IsEqualKey(
+    static bool IsEqualKey(
-		_In_ const TKey& k1,
+        _In_ const TKey& k1,
-		_In_ const TKey& k2)
+        _In_ const TKey& k2)
-	{
+    {
-		return CSimpleArrayEqualHelper<TKey>::IsEqual(k1, k2);
+        return CSimpleArrayEqualHelper<TKey>::IsEqual(k1, k2);
-	}
+    }
 
-	static bool IsEqualValue(
+    static bool IsEqualValue(
-		_In_ const TVal&,
+        _In_ const TVal&,
-		_In_ const TVal&)
+        _In_ const TVal&)
-	{
+    {
-		ATLASSERT(FALSE);
+        ATLASSERT(FALSE);
-		return false;
+        return false;
-	}
+    }
 };
 
 template <class T, class TEqual = CSimpleArrayEqualHelper< T > >
@@ -114,193 +114,193 @@ class CSimpleArray
 {
 public:
 // Construction/destruction
-	CSimpleArray() :
+    CSimpleArray() :
-		m_aT(NULL), m_nSize(0), m_nAllocSize(0)
+        m_aT(NULL), m_nSize(0), m_nAllocSize(0)
-	{
+    {
-	}
+    }
 
-	~CSimpleArray();
+    ~CSimpleArray();
 
-	CSimpleArray(_In_ const CSimpleArray< T, TEqual >& src) :
+    CSimpleArray(_In_ const CSimpleArray< T, TEqual >& src) :
-		m_aT(NULL), m_nSize(0), m_nAllocSize(0)
+        m_aT(NULL), m_nSize(0), m_nAllocSize(0)
-	{
+    {
         if (src.GetSize())
         {
-			m_aT = (T*)nb_calloc(src.GetSize(), sizeof(T));
+            m_aT = (T*)nb_calloc(src.GetSize(), sizeof(T));
-			if (m_aT != NULL)
+            if (m_aT != NULL)
-			{
+            {
-				m_nAllocSize = src.GetSize();
+                m_nAllocSize = src.GetSize();
-				for (int i=0; i<src.GetSize(); i++)
+                for (int i=0; i<src.GetSize(); i++)
-					Add(src[i]);
+                    Add(src[i]);
-			}
+            }
-		}
+        }
-	}
+    }
-	CSimpleArray< T, TEqual >& operator=(_In_ const CSimpleArray< T, TEqual >& src)
+    CSimpleArray< T, TEqual >& operator=(_In_ const CSimpleArray< T, TEqual >& src)
-	{
+    {
-		if (GetSize() != src.GetSize())
+        if (GetSize() != src.GetSize())
-		{
+        {
-			RemoveAll();
+            RemoveAll();
-			m_aT = (T*)nb_calloc(src.GetSize(), sizeof(T));
+            m_aT = (T*)nb_calloc(src.GetSize(), sizeof(T));
-			if (m_aT != NULL)
+            if (m_aT != NULL)
-				m_nAllocSize = src.GetSize();
+                m_nAllocSize = src.GetSize();
-		}
+        }
-		else
+        else
-		{
+        {
-			for (int i = GetSize(); i > 0; i--)
+            for (int i = GetSize(); i > 0; i--)
-				RemoveAt(i - 1);
+                RemoveAt(i - 1);
-		}
+        }
-		for (int i=0; i<src.GetSize(); i++)
+        for (int i=0; i<src.GetSize(); i++)
-			Add(src[i]);
+            Add(src[i]);
-		return *this;
+        return *this;
-	}
+    }
 
 // Operations
-	int GetSize() const
+    int GetSize() const
-	{
+    {
-		return m_nSize;
+        return m_nSize;
-	}
-	BOOL Add(_In_ const T& t)
-	{
-		if(m_nSize == m_nAllocSize)
-		{
-			// Make sure newElement is not a reference to an element in the array.
-			// Or else, it will be invalidated by the reallocation.
-			ATLENSURE(	(&t < m_aT) ||
-						(&t >= (m_aT + m_nAllocSize) ) );
-
-			T* aT;
-			int nNewAllocSize = (m_nAllocSize == 0) ? 1 : (m_nSize * 2);
-
-			if (nNewAllocSize<0||nNewAllocSize>INT_MAX/sizeof(T))
-			{
-				return FALSE;
-			}
-
-			aT = (T*)_recalloc(m_aT, nNewAllocSize, sizeof(T));
-			if(aT == NULL)
-				return FALSE;
-			m_nAllocSize = nNewAllocSize;
-			m_aT = aT;
-		}
-		InternalSetAtIndex(m_nSize, t);
-		m_nSize++;
-		return TRUE;
-	}
-	BOOL Remove(_In_ const T& t)
-	{
-		int nIndex = Find(t);
-		if(nIndex == -1)
-			return FALSE;
-		return RemoveAt(nIndex);
-	}
-	BOOL RemoveAt(_In_ int nIndex)
-	{
-		ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
-		if (nIndex < 0 || nIndex >= m_nSize)
-			return FALSE;
-		m_aT[nIndex].~T();
-		if(nIndex != (m_nSize - 1))
-			Checked::memmove_s((void*)(m_aT + nIndex), (m_nSize - nIndex) * sizeof(T), (void*)(m_aT + nIndex + 1), (m_nSize - (nIndex + 1)) * sizeof(T));
-		m_nSize--;
-		return TRUE;
-	}
-	void RemoveAll()
-	{
-		if(m_aT != NULL)
-		{
-			for(int i = 0; i < m_nSize; i++)
-				m_aT[i].~T();
-			nb_free(m_aT);
-			m_aT = NULL;
-		}
-		m_nSize = 0;
-		m_nAllocSize = 0;
     }
-	const T& operator[] (_In_ int nIndex) const
+    BOOL Add(_In_ const T& t)
-	{
+    {
-		ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
+        if(m_nSize == m_nAllocSize)
-		if(nIndex < 0 || nIndex >= m_nSize)
+        {
-		{
+            // Make sure newElement is not a reference to an element in the array.
-			_AtlRaiseException((DWORD)EXCEPTION_ARRAY_BOUNDS_EXCEEDED);
+            // Or else, it will be invalidated by the reallocation.
-		}
+            ATLENSURE(    (&t < m_aT) ||
-		return m_aT[nIndex];
+                        (&t >= (m_aT + m_nAllocSize) ) );
-	}
-	T& operator[] (_In_ int nIndex)
-	{
-		ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
-		if(nIndex < 0 || nIndex >= m_nSize)
-		{
-			_AtlRaiseException((DWORD)EXCEPTION_ARRAY_BOUNDS_EXCEEDED);
-		}
-		return m_aT[nIndex];
-	}
-	T* GetData() const
-	{
-		return m_aT;
-	}
 
-	int Find(_In_ const T& t) const
+            T* aT;
-	{
+            int nNewAllocSize = (m_nAllocSize == 0) ? 1 : (m_nSize * 2);
-		for(int i = 0; i < m_nSize; i++)
-		{
-			if(TEqual::IsEqual(m_aT[i], t))
-				return i;
-		}
-		return -1;  // not found
-	}
 
-	BOOL SetAtIndex(
+            if (nNewAllocSize<0||nNewAllocSize>INT_MAX/sizeof(T))
-		_In_ int nIndex,
+            {
-		_In_ const T& t)
+                return FALSE;
-	{
+            }
-		if (nIndex < 0 || nIndex >= m_nSize)
+
-			return FALSE;
+            aT = (T*)_recalloc(m_aT, nNewAllocSize, sizeof(T));
-		InternalSetAtIndex(nIndex, t);
+            if(aT == NULL)
-		return TRUE;
+                return FALSE;
-	}
+            m_nAllocSize = nNewAllocSize;
+            m_aT = aT;
+        }
+        InternalSetAtIndex(m_nSize, t);
+        m_nSize++;
+        return TRUE;
+    }
+    BOOL Remove(_In_ const T& t)
+    {
+        int nIndex = Find(t);
+        if(nIndex == -1)
+            return FALSE;
+        return RemoveAt(nIndex);
+    }
+    BOOL RemoveAt(_In_ int nIndex)
+    {
+        ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
+        if (nIndex < 0 || nIndex >= m_nSize)
+            return FALSE;
+        m_aT[nIndex].~T();
+        if(nIndex != (m_nSize - 1))
+            Checked::memmove_s((void*)(m_aT + nIndex), (m_nSize - nIndex) * sizeof(T), (void*)(m_aT + nIndex + 1), (m_nSize - (nIndex + 1)) * sizeof(T));
+        m_nSize--;
+        return TRUE;
+    }
+    void RemoveAll()
+    {
+        if(m_aT != NULL)
+        {
+            for(int i = 0; i < m_nSize; i++)
+                m_aT[i].~T();
+            nb_free(m_aT);
+            m_aT = NULL;
+        }
+        m_nSize = 0;
+        m_nAllocSize = 0;
+    }
+    const T& operator[] (_In_ int nIndex) const
+    {
+        ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
+        if(nIndex < 0 || nIndex >= m_nSize)
+        {
+            _AtlRaiseException((DWORD)EXCEPTION_ARRAY_BOUNDS_EXCEEDED);
+        }
+        return m_aT[nIndex];
+    }
+    T& operator[] (_In_ int nIndex)
+    {
+        ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
+        if(nIndex < 0 || nIndex >= m_nSize)
+        {
+            _AtlRaiseException((DWORD)EXCEPTION_ARRAY_BOUNDS_EXCEEDED);
+        }
+        return m_aT[nIndex];
+    }
+    T* GetData() const
+    {
+        return m_aT;
+    }
+
+    int Find(_In_ const T& t) const
+    {
+        for(int i = 0; i < m_nSize; i++)
+        {
+            if(TEqual::IsEqual(m_aT[i], t))
+                return i;
+        }
+        return -1;  // not found
+    }
+
+    BOOL SetAtIndex(
+        _In_ int nIndex,
+        _In_ const T& t)
+    {
+        if (nIndex < 0 || nIndex >= m_nSize)
+            return FALSE;
+        InternalSetAtIndex(nIndex, t);
+        return TRUE;
+    }
 
 // Implementation
-	class Wrapper
+    class Wrapper
-	{
+    {
-	public:
+    public:
-		Wrapper(_In_ const T& _t) : t(_t)
+        Wrapper(_In_ const T& _t) : t(_t)
-		{
+        {
-		}
+        }
-		template <class _Ty>
+        template <class _Ty>
-		void * __cdecl operator new(
+        void * __cdecl operator new(
-			_In_ size_t,
+            _In_ size_t,
-			_In_ _Ty* p)
+            _In_ _Ty* p)
-		{
+        {
-			return p;
+            return p;
-		}
+        }
-		template <class _Ty>
+        template <class _Ty>
-		void __cdecl operator delete(
+        void __cdecl operator delete(
-			_In_ void* /* pv */,
+            _In_ void* /* pv */,
-			_In_ _Ty* /* p */)
+            _In_ _Ty* /* p */)
-		{
+        {
-		}
+        }
-		T t;
+        T t;
-	};
+    };
 
 // Implementation
-	void InternalSetAtIndex(
+    void InternalSetAtIndex(
-		_In_ int nIndex,
+        _In_ int nIndex,
-		_In_ const T& t)
+        _In_ const T& t)
-	{
+    {
-		new(m_aT + nIndex) Wrapper(t);
+        new(m_aT + nIndex) Wrapper(t);
-	}
+    }
 
-	typedef T _ArrayElementType;
+    typedef T _ArrayElementType;
-	T* m_aT;
+    T* m_aT;
-	int m_nSize;
+    int m_nSize;
-	int m_nAllocSize;
+    int m_nAllocSize;
 };
 
 #define CSimpleValArray CSimpleArray
 
 template <class T, class TEqual> inline CSimpleArray<T, TEqual>::~CSimpleArray()
 {
-	RemoveAll();
+    RemoveAll();
 }
 
 // intended for small number of simple types or pointers
@@ -308,204 +308,204 @@ template <class TKey, class TVal, class TEqual = CSimpleMapEqualHelper< TKey, TV
 class CSimpleMap
 {
 public:
-	TKey* m_aKey;
+    TKey* m_aKey;
-	TVal* m_aVal;
+    TVal* m_aVal;
-	int m_nSize;
+    int m_nSize;
 
-	typedef TKey _ArrayKeyType;
+    typedef TKey _ArrayKeyType;
-	typedef TVal _ArrayElementType;
+    typedef TVal _ArrayElementType;
 
 // Construction/destruction
-	CSimpleMap() :
+    CSimpleMap() :
-		m_aKey(NULL), m_aVal(NULL), m_nSize(0)
+        m_aKey(NULL), m_aVal(NULL), m_nSize(0)
-	{
+    {
-	}
+    }
 
-	~CSimpleMap()
+    ~CSimpleMap()
-	{
+    {
-		RemoveAll();
+        RemoveAll();
-	}
+    }
 
 // Operations
-	int GetSize() const
+    int GetSize() const
-	{
+    {
-		return m_nSize;
+        return m_nSize;
-	}
+    }
-	BOOL Add(
+    BOOL Add(
-		_In_ const TKey& key,
+        _In_ const TKey& key,
-		_In_ const TVal& val)
+        _In_ const TVal& val)
-	{
+    {
-		TKey* pKey;
+        TKey* pKey;
-		pKey = (TKey*)_recalloc(m_aKey, (m_nSize + 1), sizeof(TKey));
+        pKey = (TKey*)_recalloc(m_aKey, (m_nSize + 1), sizeof(TKey));
-		if(pKey == NULL)
+        if(pKey == NULL)
-			return FALSE;
+            return FALSE;
-		m_aKey = pKey;
+        m_aKey = pKey;
-		TVal* pVal;
+        TVal* pVal;
-		pVal = (TVal*)_recalloc(m_aVal, (m_nSize + 1), sizeof(TVal));
+        pVal = (TVal*)_recalloc(m_aVal, (m_nSize + 1), sizeof(TVal));
-		if(pVal == NULL)
+        if(pVal == NULL)
-			return FALSE;
+            return FALSE;
-		m_aVal = pVal;
+        m_aVal = pVal;
-		InternalSetAtIndex(m_nSize, key, val);
+        InternalSetAtIndex(m_nSize, key, val);
-		m_nSize++;
+        m_nSize++;
-		return TRUE;
+        return TRUE;
-	}
+    }
-	BOOL Remove(_In_ const TKey& key)
+    BOOL Remove(_In_ const TKey& key)
-	{
+    {
-		int nIndex = FindKey(key);
+        int nIndex = FindKey(key);
-		if(nIndex == -1)
+        if(nIndex == -1)
-			return FALSE;
+            return FALSE;
-		return RemoveAt(nIndex);
+        return RemoveAt(nIndex);
-	}
+    }
-	BOOL RemoveAt(_In_ int nIndex)
+    BOOL RemoveAt(_In_ int nIndex)
-	{
+    {
-		ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
+        ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
-		if (nIndex < 0 || nIndex >= m_nSize)
+        if (nIndex < 0 || nIndex >= m_nSize)
-			return FALSE;
+            return FALSE;
-		m_aKey[nIndex].~TKey();
+        m_aKey[nIndex].~TKey();
-		m_aVal[nIndex].~TVal();
+        m_aVal[nIndex].~TVal();
-		if(nIndex != (m_nSize - 1))
+        if(nIndex != (m_nSize - 1))
-		{
+        {
-			Checked::memmove_s((void*)(m_aKey + nIndex), (m_nSize - nIndex) * sizeof(TKey), (void*)(m_aKey + nIndex + 1), (m_nSize - (nIndex + 1)) * sizeof(TKey));
+            Checked::memmove_s((void*)(m_aKey + nIndex), (m_nSize - nIndex) * sizeof(TKey), (void*)(m_aKey + nIndex + 1), (m_nSize - (nIndex + 1)) * sizeof(TKey));
-			Checked::memmove_s((void*)(m_aVal + nIndex), (m_nSize - nIndex) * sizeof(TVal), (void*)(m_aVal + nIndex + 1), (m_nSize - (nIndex + 1)) * sizeof(TVal));
+            Checked::memmove_s((void*)(m_aVal + nIndex), (m_nSize - nIndex) * sizeof(TVal), (void*)(m_aVal + nIndex + 1), (m_nSize - (nIndex + 1)) * sizeof(TVal));
-		}
+        }
-		TKey* pKey;
+        TKey* pKey;
-		pKey = (TKey*)_recalloc(m_aKey, (m_nSize - 1), sizeof(TKey));
+        pKey = (TKey*)_recalloc(m_aKey, (m_nSize - 1), sizeof(TKey));
-		if(pKey != NULL || m_nSize == 1)
+        if(pKey != NULL || m_nSize == 1)
-			m_aKey = pKey;
+            m_aKey = pKey;
-		TVal* pVal;
+        TVal* pVal;
-		pVal = (TVal*)_recalloc(m_aVal, (m_nSize - 1), sizeof(TVal));
+        pVal = (TVal*)_recalloc(m_aVal, (m_nSize - 1), sizeof(TVal));
-		if(pVal != NULL || m_nSize == 1)
+        if(pVal != NULL || m_nSize == 1)
-			m_aVal = pVal;
+            m_aVal = pVal;
-		m_nSize--;
+        m_nSize--;
-		return TRUE;
+        return TRUE;
-	}
+    }
-	void RemoveAll()
+    void RemoveAll()
-	{
+    {
-		if(m_aKey != NULL)
+        if(m_aKey != NULL)
-		{
+        {
-			for(int i = 0; i < m_nSize; i++)
+            for(int i = 0; i < m_nSize; i++)
-			{
+            {
-				m_aKey[i].~TKey();
+                m_aKey[i].~TKey();
-				m_aVal[i].~TVal();
+                m_aVal[i].~TVal();
-			}
+            }
-			nb_free(m_aKey);
+            nb_free(m_aKey);
-			m_aKey = NULL;
+            m_aKey = NULL;
-		}
+        }
-		if(m_aVal != NULL)
+        if(m_aVal != NULL)
-		{
+        {
-			nb_free(m_aVal);
+            nb_free(m_aVal);
-			m_aVal = NULL;
+            m_aVal = NULL;
-		}
+        }
 
-		m_nSize = 0;
+        m_nSize = 0;
-	}
+    }
-	BOOL SetAt(
+    BOOL SetAt(
-		_In_ const TKey& key,
+        _In_ const TKey& key,
-		_In_ const TVal& val)
+        _In_ const TVal& val)
-	{
+    {
-		int nIndex = FindKey(key);
+        int nIndex = FindKey(key);
-		if(nIndex == -1)
+        if(nIndex == -1)
-			return FALSE;
+            return FALSE;
-		ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
+        ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
-		m_aKey[nIndex].~TKey();
+        m_aKey[nIndex].~TKey();
-		m_aVal[nIndex].~TVal();
+        m_aVal[nIndex].~TVal();
-		InternalSetAtIndex(nIndex, key, val);
+        InternalSetAtIndex(nIndex, key, val);
-		return TRUE;
+        return TRUE;
-	}
+    }
-	TVal Lookup(_In_ const TKey& key) const
+    TVal Lookup(_In_ const TKey& key) const
-	{
+    {
-		int nIndex = FindKey(key);
+        int nIndex = FindKey(key);
-		if(nIndex == -1)
+        if(nIndex == -1)
-			return NULL;    // must be able to convert
+            return NULL;    // must be able to convert
-		return GetValueAt(nIndex);
+        return GetValueAt(nIndex);
-	}
+    }
-	TKey ReverseLookup(_In_ const TVal& val) const
+    TKey ReverseLookup(_In_ const TVal& val) const
-	{
+    {
-		int nIndex = FindVal(val);
+        int nIndex = FindVal(val);
-		if(nIndex == -1)
+        if(nIndex == -1)
-			return NULL;    // must be able to convert
+            return NULL;    // must be able to convert
-		return GetKeyAt(nIndex);
+        return GetKeyAt(nIndex);
-	}
+    }
-	TKey& GetKeyAt(_In_ int nIndex) const
+    TKey& GetKeyAt(_In_ int nIndex) const
-	{
+    {
-		ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
+        ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
-		if(nIndex < 0 || nIndex >= m_nSize)
+        if(nIndex < 0 || nIndex >= m_nSize)
-			_AtlRaiseException((DWORD)EXCEPTION_ARRAY_BOUNDS_EXCEEDED);
+            _AtlRaiseException((DWORD)EXCEPTION_ARRAY_BOUNDS_EXCEEDED);
 
-		return m_aKey[nIndex];
+        return m_aKey[nIndex];
-	}
+    }
-	TVal& GetValueAt(_In_ int nIndex) const
+    TVal& GetValueAt(_In_ int nIndex) const
-	{
+    {
-		ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
+        ATLASSERT(nIndex >= 0 && nIndex < m_nSize);
-		if(nIndex < 0 || nIndex >= m_nSize)
+        if(nIndex < 0 || nIndex >= m_nSize)
-			_AtlRaiseException((DWORD)EXCEPTION_ARRAY_BOUNDS_EXCEEDED);
+            _AtlRaiseException((DWORD)EXCEPTION_ARRAY_BOUNDS_EXCEEDED);
 
-		return m_aVal[nIndex];
+        return m_aVal[nIndex];
-	}
+    }
 
-	int FindKey(_In_ const TKey& key) const
+    int FindKey(_In_ const TKey& key) const
-	{
+    {
-		for(int i = 0; i < m_nSize; i++)
+        for(int i = 0; i < m_nSize; i++)
-		{
+        {
-			if(TEqual::IsEqualKey(m_aKey[i], key))
+            if(TEqual::IsEqualKey(m_aKey[i], key))
-				return i;
+                return i;
-		}
+        }
-		return -1;  // not found
+        return -1;  // not found
-	}
+    }
-	int FindVal(_In_ const TVal& val) const
+    int FindVal(_In_ const TVal& val) const
-	{
+    {
-		for(int i = 0; i < m_nSize; i++)
+        for(int i = 0; i < m_nSize; i++)
-		{
+        {
-			if(TEqual::IsEqualValue(m_aVal[i], val))
+            if(TEqual::IsEqualValue(m_aVal[i], val))
-				return i;
+                return i;
-		}
+        }
-		return -1;  // not found
+        return -1;  // not found
-	}
+    }
 
-	BOOL SetAtIndex(
+    BOOL SetAtIndex(
-		_In_ int nIndex,
+        _In_ int nIndex,
-		_In_ const TKey& key,
+        _In_ const TKey& key,
-		_In_ const TVal& val)
+        _In_ const TVal& val)
-	{
+    {
-		if (nIndex < 0 || nIndex >= m_nSize)
+        if (nIndex < 0 || nIndex >= m_nSize)
-			return FALSE;
+            return FALSE;
-		InternalSetAtIndex(nIndex, key, val);
+        InternalSetAtIndex(nIndex, key, val);
-		return TRUE;
+        return TRUE;
-	}
+    }
 
 
 // Implementation
 
-	template <typename T>
+    template <typename T>
-	class Wrapper
+    class Wrapper
-	{
+    {
-	public:
+    public:
-		Wrapper(_In_ const T& _t) : t(_t)
+        Wrapper(_In_ const T& _t) : t(_t)
-		{
+        {
-		}
+        }
-		template <class _Ty>
+        template <class _Ty>
-		void *operator new(
+        void *operator new(
-			_In_ size_t,
+            _In_ size_t,
-			_In_ _Ty* p)
+            _In_ _Ty* p)
-		{
+        {
-			return p;
+            return p;
-		}
+        }
-		template <class _Ty>
+        template <class _Ty>
-		void operator delete(
+        void operator delete(
-			_In_ void* /* pv */,
+            _In_ void* /* pv */,
-			_In_ _Ty* /* p */)
+            _In_ _Ty* /* p */)
-		{
+        {
-		}
+        }
-		T t;
+        T t;
-	};
+    };
-	void InternalSetAtIndex(
+    void InternalSetAtIndex(
-		_In_ int nIndex,
+        _In_ int nIndex,
-		_In_ const TKey& key,
+        _In_ const TKey& key,
-		_In_ const TVal& val)
+        _In_ const TVal& val)
-	{
+    {
-		new(m_aKey + nIndex) Wrapper<TKey>(key);
+        new(m_aKey + nIndex) Wrapper<TKey>(key);
-		new(m_aVal + nIndex) Wrapper<TVal>(val);
+        new(m_aVal + nIndex) Wrapper<TVal>(val);
-	}
+    }
 };
 
 #pragma pop_macro("new")

src/main/java/com/jacob/activeX/.cvsignore

@@ -1,2 +0,0 @@
-*.class
-

src/main/java/com/jacob/activeX/ActiveXComponent.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.activeX;
 
@@ -39,441 +58,541 @@ import com.jacob.com.Variant;
  */
 public class ActiveXComponent extends Dispatch {
 
-	/**
+    /**
-	 * Normally used to create a new connection to a microsoft application. The
+     * Normally used to create a new connection to a microsoft application. The
-	 * passed in parameter is the name of the program as registered in the
+     * passed in parameter is the name of the program as registered in the
-	 * registry. It can also be the object name.
+     * registry. It can also be the object name.
-	 * <p>
+     * <p>
-	 * This constructor causes a new Windows object of the requested type to be
+     * This constructor causes a new Windows object of the requested type to be
-	 * created. The windows CoCreate() function gets called to create the
+     * created. The windows CoCreate() function gets called to create the
-	 * underlying windows object.
+     * underlying windows object.
-	 * 
+     * 
-	 * <pre>
+     * <pre>
-	 * new ActiveXComponent(&quot;ScriptControl&quot;);
+     * new ActiveXComponent(&quot;ScriptControl&quot;);
-	 * </pre>
+     * </pre>
-	 * 
+     * 
-	 * @param programId
+     * @param programId
-	 */
+     */
-	public ActiveXComponent(String programId) {
+    public ActiveXComponent(String programId) {
-		super(programId);
+        super(programId);
-	}
+    }
 
-	/**
+    /**
-	 * Creates an active X component that is built on top of the COM pointers
+     * Creates an active X component that is built on top of the COM pointers
-	 * held in the passed in dispatch. This widens the Dispatch object to pick
+     * held in the passed in dispatch. This widens the Dispatch object to pick
-	 * up the ActiveXComponent API
+     * up the ActiveXComponent API
-	 * 
+     * 
-	 * @param dispatchToBeWrapped
+     * @param dispatchToBeWrapped
-	 */
+     */
-	public ActiveXComponent(Dispatch dispatchToBeWrapped) {
+    public ActiveXComponent(Dispatch dispatchToBeWrapped) {
-		super(dispatchToBeWrapped);
+        super(dispatchToBeWrapped);
-	}
+    }
 
-	/**
+    /**
-	 * only used by the factories
+     * only used by the factories
-	 * 
+     * 
-	 */
+     */
-	private ActiveXComponent() {
+    private ActiveXComponent() {
-		super();
+        super();
-	}
+    }
 
-	/**
+    /**
-	 * Probably was a cover for something else in the past. Should be
+     * Probably was a cover for something else in the past. Should be
-	 * deprecated.
+     * deprecated.
-	 * 
+     * 
-	 * @return Now it actually returns this exact same object.
+     * @return Now it actually returns this exact same object.
-	 */
+     */
-	public Dispatch getObject() {
+    public Dispatch getObject() {
-		return this;
+        return this;
-	}
+    }
 
-	/**
+    /**
-	 * Most code should use the standard ActiveXComponent(String) contructor and
+     * Most code should use the standard ActiveXComponent(String) contructor and
-	 * not this factory method. This method exists for applications that need
+     * not this factory method. This method exists for applications that need
-	 * special behavior. <B>Experimental in release 1.9.2.</B>
+     * special behavior. <B>Experimental in release 1.9.2.</B>
-	 * <p>
+     * <p>
-	 * Factory that returns a Dispatch object wrapped around the result of a
+     * Factory that returns a Dispatch object wrapped around the result of a
-	 * CoCreate() call. This differs from the standard constructor in that it
+     * CoCreate() call. This differs from the standard constructor in that it
-	 * throws no exceptions and returns null on failure.
+     * throws no exceptions and returns null on failure.
-	 * <p>
+     * <p>
-	 * This will fail for any prog id with a ":" in it.
+     * This will fail for any prog id with a ":" in it.
-	 * 
+     * 
-	 * @param pRequestedProgramId
+     * @param pRequestedProgramId
-	 * @return Dispatch pointer to the COM object or null if couldn't create
+     * @return Dispatch pointer to the COM object or null if couldn't create
-	 */
+     */
-	public static ActiveXComponent createNewInstance(String pRequestedProgramId) {
+    public static ActiveXComponent createNewInstance(String pRequestedProgramId) {
-		ActiveXComponent mCreatedDispatch = null;
+        ActiveXComponent mCreatedDispatch = null;
-		try {
+        try {
-			mCreatedDispatch = new ActiveXComponent();
+            mCreatedDispatch = new ActiveXComponent();
-			mCreatedDispatch.coCreateInstance(pRequestedProgramId);
+            mCreatedDispatch.coCreateInstance(pRequestedProgramId);
-		} catch (Exception e) {
+        } catch (Exception e) {
-			mCreatedDispatch = null;
+            mCreatedDispatch = null;
-			if (JacobObject.isDebugEnabled()) {
+            if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("Unable to co-create instance of "
+                JacobObject.debug("Unable to co-create instance of "
-						+ pRequestedProgramId);
+                        + pRequestedProgramId);
-			}
+            }
-		}
+        }
-		return mCreatedDispatch;
+        return mCreatedDispatch;
-	}
+    }
 
-	/**
+    /**
-	 * Most code should use the standard ActiveXComponent(String) constructor
+     * Most code should use the standard ActiveXComponent(String) constructor and
-	 * and not this factory method. This method exists for applications that
+     * not this factory method. This method exists for applications that need
-	 * need special behavior. <B>Experimental in release 1.9.2.</B>
+     * special behavior. <B>Experimental in release 1.9.2.</B>
-	 * <p>
+     * <p>
-	 * Factory that returns a Dispatch wrapped around the result of a
+     * Factory that returns a Dispatch wrapped around the result of a
-	 * getActiveObject() call. This differs from the standard constructor in
+     * getActiveObject() call. This differs from the standard constructor in
-	 * that it throws no exceptions and returns null on failure.
+     * that it throws no exceptions and returns null on failure.
-	 * <p>
+     * <p>
-	 * This will fail for any prog id with a ":" in it
+     * This will fail for any prog id with a ":" in it
-	 * 
+     * 
-	 * @param pRequestedProgramId
+     * @param pRequestedProgramId
-	 * @return Dispatch pointer to a COM object or null if wasn't already
+     * @return Dispatch pointer to a COM object or null if wasn't already
-	 *         running
+     *         running
-	 */
+     */
-	public static ActiveXComponent connectToActiveInstance(
+    public static ActiveXComponent connectToActiveInstance(
-			String pRequestedProgramId) {
+            String pRequestedProgramId) {
-		ActiveXComponent mCreatedDispatch = null;
+        ActiveXComponent mCreatedDispatch = null;
-		try {
+        try {
-			mCreatedDispatch = new ActiveXComponent();
+            mCreatedDispatch = new ActiveXComponent();
-			mCreatedDispatch.getActiveInstance(pRequestedProgramId);
+            mCreatedDispatch.getActiveInstance(pRequestedProgramId);
-		} catch (Exception e) {
+        } catch (Exception e) {
-			mCreatedDispatch = null;
+            mCreatedDispatch = null;
-			if (JacobObject.isDebugEnabled()) {
+            if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("Unable to attach to running instance of "
+                JacobObject.debug("Unable to attach to running instance of "
-						+ pRequestedProgramId);
+                        + pRequestedProgramId);
-			}
+            }
-		}
+        }
-		return mCreatedDispatch;
+        return mCreatedDispatch;
-	}
+    }
 
-	/**
+    /**
-	 * @see com.jacob.com.Dispatch#finalize()
+     * @see com.jacob.com.Dispatch#finalize()
-	 */
+     */
-	@Override
+    protected void finalize() {
-	protected void finalize() {
+        super.finalize();
-		super.finalize();
+    }
-	}
 
-	/*
+    /*
-	 * ============================================================
+     * ============================================================
-	 * 
+     * 
-	 * start of instance based calls to the COM layer
+     * start of instance based calls to the COM layer
-	 * ===========================================================
+     * ===========================================================
-	 */
+     */
 
-	/**
+    /**
-	 * retrieves a property and returns it as a Variant
+     * retrieves a property and returns it as a Variant
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 * @return variant value of property
+     * @return variant value of property
-	 */
+     */
-	public Variant getProperty(String propertyName) {
+    public Variant getProperty(String propertyName) {
-		return Dispatch.get(this, propertyName);
+        return Dispatch.get(this, propertyName);
-	}
+    }
 
-	/**
+    /**
-	 * retrieves a property and returns it as an ActiveX component
+     * retrieves a property and returns it as an ActiveX component
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 * @return Dispatch representing the object under the property name
+     * @return Dispatch representing the object under the property name
-	 */
+     */
-	public ActiveXComponent getPropertyAsComponent(String propertyName) {
+    public ActiveXComponent getPropertyAsComponent(String propertyName) {
-		return new ActiveXComponent(Dispatch.get(this, propertyName)
+        return new ActiveXComponent(Dispatch.get(this, propertyName)
-				.toDispatch());
+                .toDispatch());
 
-	}
+    }
 
-	/**
+    /**
-	 * retrieves a property and returns it as a Boolean
+     * retrieves a property and returns it as a Boolean
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 *            property we are looking up
+     *            property we are looking up
-	 * @return boolean value of property
+     * @return boolean value of property
-	 */
+     */
-	public boolean getPropertyAsBoolean(String propertyName) {
+    public boolean getPropertyAsBoolean(String propertyName) {
-		return Dispatch.get(this, propertyName).getBoolean();
+        return Dispatch.get(this, propertyName).getBoolean();
-	}
+    }
 
-	/**
+    /**
-	 * retrieves a property and returns it as a byte
+     * retrieves a property and returns it as a byte
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 *            property we are looking up
+     *            property we are looking up
-	 * @return byte value of property
+     * @return byte value of property
-	 */
+     */
-	public byte getPropertyAsByte(String propertyName) {
+    public byte getPropertyAsByte(String propertyName) {
-		return Dispatch.get(this, propertyName).getByte();
+        return Dispatch.get(this, propertyName).getByte();
-	}
+    }
 
-	/**
+    /**
-	 * retrieves a property and returns it as a String
+     * retrieves a property and returns it as a String
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 * @return String value of property
+     * @return String value of property
-	 */
+     */
-	public String getPropertyAsString(String propertyName) {
+    public String getPropertyAsString(String propertyName) {
-		return Dispatch.get(this, propertyName).getString();
+        return Dispatch.get(this, propertyName).getString();
 
-	}
+    }
 
-	/**
+    /**
-	 * retrieves a property and returns it as a int
+     * retrieves a property and returns it as a int
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 * @return the property value as an int
+     * @return the property value as an int
-	 */
+     */
-	public int getPropertyAsInt(String propertyName) {
+    public int getPropertyAsInt(String propertyName) {
-		return Dispatch.get(this, propertyName).getInt();
+        return Dispatch.get(this, propertyName).getInt();
-	}
+    }
 
-	/**
+    /**
-	 * sets a property on this object
+     * sets a property on this object
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 *            property name
+     *            property name
-	 * @param arg
+     * @param arg
-	 *            variant value to be set
+     *            variant value to be set
-	 */
+     */
-	public void setProperty(String propertyName, Variant arg) {
+    public void setProperty(String propertyName, Variant arg) {
-		Dispatch.put(this, propertyName, arg);
+        Dispatch.put(this, propertyName, arg);
-	}
+    }
 
-	/**
+    /**
-	 * sets a property on this object
+     * sets a property on this object
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 *            property name
+     *            property name
-	 * @param arg
+     * @param arg
-	 *            variant value to be set
+     *            variant value to be set
-	 */
+     */
-	public void setProperty(String propertyName, Dispatch arg) {
+    public void setProperty(String propertyName, Dispatch arg) {
-		Dispatch.put(this, propertyName, arg);
+        Dispatch.put(this, propertyName, arg);
-	}
+    }
 
-	/**
+    /**
-	 * sets a property to be the value of the string
+     * sets a property to be the value of the string
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 * @param propertyValue
+     * @param propertyValue
-	 */
+     */
-	public void setProperty(String propertyName, String propertyValue) {
+    public void setProperty(String propertyName, String propertyValue) {
-		this.setProperty(propertyName, new Variant(propertyValue));
+        this.setProperty(propertyName, new Variant(propertyValue));
-	}
+    }
 
-	/**
+    /**
-	 * sets a property as a boolean value
+     * sets a property as a boolean value
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 * @param propValue
+     * @param propValue
-	 *            the boolean value we want the prop set to
+     *            the boolean value we want the prop set to
-	 */
+     */
-	public void setProperty(String propertyName, boolean propValue) {
+    public void setProperty(String propertyName, boolean propValue) {
-		this.setProperty(propertyName, new Variant(propValue));
+        this.setProperty(propertyName, new Variant(propValue));
-	}
+    }
 
-	/**
+    /**
-	 * sets a property as a boolean value
+     * sets a property as a boolean value
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 * @param propValue
+     * @param propValue
-	 *            the boolean value we want the prop set to
+     *            the boolean value we want the prop set to
-	 */
+     */
-	public void setProperty(String propertyName, byte propValue) {
+    public void setProperty(String propertyName, byte propValue) {
-		this.setProperty(propertyName, new Variant(propValue));
+        this.setProperty(propertyName, new Variant(propValue));
-	}
+    }
 
-	/**
+    /**
-	 * sets the property as an int value
+     * sets the property as an int value
-	 * 
+     * 
-	 * @param propertyName
+     * @param propertyName
-	 * @param propValue
+     * @param propValue
-	 *            the int value we want the prop to be set to.
+     *            the int value we want the prop to be set to.
-	 */
+     */
-	public void setProperty(String propertyName, int propValue) {
+    public void setProperty(String propertyName, int propValue) {
-		this.setProperty(propertyName, new Variant(propValue));
+        this.setProperty(propertyName, new Variant(propValue));
-	}
+    }
 
-	/*-------------------------------------------------------
+    /*-------------------------------------------------------
-	 * Listener logging helpers
+     * Listener logging helpers
-	 *-------------------------------------------------------
+     *-------------------------------------------------------
-	 */
+     */
 
-	/**
+    /**
-	 * This boolean determines if callback events should be logged
+     * This boolean determines if callback events should be logged
-	 */
+     */
-	public static boolean shouldLogEvents = false;
+    public static boolean shouldLogEvents = false;
 
-	/**
+    /**
-	 * used by the doc and application listeners to get intelligent logging
+     * used by the doc and application listeners to get intelligent logging
-	 * 
+     * 
-	 * @param description
+     * @param description
-	 *            event description
+     *            event description
-	 * @param args
+     * @param args
-	 *            args passed in (variants)
+     *            args passed in (variants)
-	 * 
+     * 
-	 */
+     */
-	public void logCallbackEvent(String description, Variant[] args) {
+    public void logCallbackEvent(String description, Variant[] args) {
-		String argString = "";
+        String argString = "";
-		if (args != null && ActiveXComponent.shouldLogEvents) {
+        if (args != null && ActiveXComponent.shouldLogEvents) {
-			if (args.length > 0) {
+            if (args.length > 0) {
-				argString += " args: ";
+                argString += " args: ";
-			}
+            }
-			for (int i = 0; i < args.length; i++) {
+            for (int i = 0; i < args.length; i++) {
-				short argType = args[i].getvt();
+                short argType = args[i].getvt();
-				argString += ",[" + i + "]";
+                argString += ",[" + i + "]";
-				// break out the byref bits if they are on this
+                // break out the byref bits if they are on this
-				if ((argType & Variant.VariantByref) == Variant.VariantByref) {
+                if ((argType & Variant.VariantByref) == Variant.VariantByref) {
-					// show the type and the fact that its byref
+                    // show the type and the fact that its byref
-					argString += "("
+                    argString += "("
-							+ (args[i].getvt() & ~Variant.VariantByref) + "/"
+                            + (args[i].getvt() & ~Variant.VariantByref) + "/"
-							+ Variant.VariantByref + ")";
+                            + Variant.VariantByref + ")";
-				} else {
+                } else {
-					// show the type
+                    // show the type
-					argString += "(" + argType + ")";
+                    argString += "(" + argType + ")";
-				}
+                }
-				argString += "=";
+                argString += "=";
-				if (argType == Variant.VariantDispatch) {
+                if (argType == Variant.VariantDispatch) {
-					Dispatch foo = (args[i].getDispatch());
+                    Dispatch foo = (args[i].getDispatch());
-					argString += foo;
+                    argString += foo;
-				} else if ((argType & Variant.VariantBoolean) == Variant.VariantBoolean) {
+                } else if ((argType & Variant.VariantBoolean) == Variant.VariantBoolean) {
-					// do the boolean thing
+                    // do the boolean thing
-					if ((argType & Variant.VariantByref) == Variant.VariantByref) {
+                    if ((argType & Variant.VariantByref) == Variant.VariantByref) {
-						// boolean by ref
+                        // boolean by ref
-						argString += args[i].getBooleanRef();
+                        argString += args[i].getBooleanRef();
-					} else {
+                    } else {
-						// boolean by value
+                        // boolean by value
-						argString += args[i].getBoolean();
+                        argString += args[i].getBoolean();
-					}
+                    }
-				} else if ((argType & Variant.VariantString) == Variant.VariantString) {
+                } else if ((argType & Variant.VariantString) == Variant.VariantString) {
-					// do the string thing
+                    // do the string thing
-					if ((argType & Variant.VariantByref) == Variant.VariantByref) {
+                    if ((argType & Variant.VariantByref) == Variant.VariantByref) {
-						// string by ref
+                        // string by ref
-						argString += args[i].getStringRef();
+                        argString += args[i].getStringRef();
-					} else {
+                    } else {
-						// string by value
+                        // string by value
-						argString += args[i].getString();
+                        argString += args[i].getString();
-					}
+                    }
-				} else {
+                } else {
-					argString += args[i].toString();
+                    argString += args[i].toString();
-				}
+                }
-			}
+            }
-			System.out.println(description + argString);
+            System.out.println(description + argString);
-		}
+        }
-	}
+    }
 
-	/*
+    /*
-	 * ==============================================================
+     * ==============================================================
-	 * 
+     * 
-	 * covers for dispatch call methods
+     * covers for dispatch call methods
-	 * =============================================================
+     * =============================================================
-	 */
+     */
 
-	/**
+    /**
-	 * makes a dispatch call for the passed in action and no parameter
+     * makes a dispatch call for the passed in action and no parameter
-	 * 
+     * 
-	 * @param callAction
+     * @param callAction
-	 * @return ActiveXComponent representing the results of the call
+     * @return ActiveXComponent representing the results of the call
-	 */
+     */
-	public ActiveXComponent invokeGetComponent(String callAction) {
+    public ActiveXComponent invokeGetComponent(String callAction) {
-		return new ActiveXComponent(invoke(callAction).toDispatch());
+        return new ActiveXComponent(invoke(callAction).toDispatch());
-	}
+    }
 
-	/**
+    /**
-	 * makes a dispatch call for the passed in action and single parameter
+     * makes a dispatch call for the passed in action and single parameter
-	 * 
+     * 
-	 * @param callAction
+     * @param callAction
-	 * @param parameters
+     * @param parameter
-	 * @return ActiveXComponent representing the results of the call
+     * @return ActiveXComponent representing the results of the call
-	 */
+     */
-	public ActiveXComponent invokeGetComponent(String callAction,
+    public ActiveXComponent invokeGetComponent(String callAction,
-			Variant... parameters) {
+            Variant parameter) {
-		return new ActiveXComponent(invoke(callAction, parameters).toDispatch());
+        return new ActiveXComponent(invoke(callAction, parameter).toDispatch());
-	}
+    }
 
-	/**
+    /**
-	 * invokes a single parameter call on this dispatch that returns no value
+     * makes a dispatch call for the passed in action and single parameter
-	 * 
+     * 
-	 * @param actionCommand
+     * @param callAction
-	 * @param parameter
+     * @param parameter1
-	 * @return a Variant but that may be null for some calls
+     * @param parameter2
-	 */
+     * @return ActiveXComponent representing the results of the call
-	public Variant invoke(String actionCommand, String parameter) {
+     */
-		return Dispatch.call(this, actionCommand, parameter);
+    public ActiveXComponent invokeGetComponent(String callAction,
-	}
+            Variant parameter1, Variant parameter2) {
+        return new ActiveXComponent(invoke(callAction, parameter1, parameter2)
+                .toDispatch());
+    }
 
-	/**
+    /**
-	 * makes a dispatch call to the passed in action with a single boolean
+     * makes a dispatch call for the passed in action and single parameter
-	 * parameter
+     * 
-	 * 
+     * @param callAction
-	 * @param actionCommand
+     * @param parameter1
-	 * @param parameter
+     * @param parameter2
-	 * @return Variant result
+     * @param parameter3
-	 */
+     * @return ActiveXComponent representing the results of the call
-	public Variant invoke(String actionCommand, boolean parameter) {
+     */
-		return Dispatch.call(this, actionCommand, new Variant(parameter));
+    public ActiveXComponent invokeGetComponent(String callAction,
-	}
+            Variant parameter1, Variant parameter2, Variant parameter3) {
+        return new ActiveXComponent(invoke(callAction, parameter1, parameter2,
+                parameter3).toDispatch());
+    }
 
-	/**
+    /**
-	 * makes a dispatch call to the passed in action with a single int parameter
+     * makes a dispatch call for the passed in action and single parameter
-	 * 
+     * 
-	 * @param actionCommand
+     * @param callAction
-	 * @param parameter
+     * @param parameter1
-	 * @return Variant result of the invoke (Dispatch.call)
+     * @param parameter2
-	 */
+     * @param parameter3
-	public Variant invoke(String actionCommand, int parameter) {
+     * @param parameter4
-		return Dispatch.call(this, actionCommand, new Variant(parameter));
+     * @return ActiveXComponent representing the results of the call
-	}
+     */
+    public ActiveXComponent invokeGetComponent(String callAction,
+            Variant parameter1, Variant parameter2, Variant parameter3,
+            Variant parameter4) {
+        return new ActiveXComponent(invoke(callAction, parameter1, parameter2,
+                parameter3, parameter4).toDispatch());
+    }
 
-	/**
+    /**
-	 * makes a dispatch call to the passed in action with a string and integer
+     * invokes a single parameter call on this dispatch that returns no value
-	 * parameter (this was put in for some application)
+     * 
-	 * 
+     * @param actionCommand
-	 * @param actionCommand
+     * @param parameter
-	 * @param parameter1
+     * @return a Variant but that may be null for some calls
-	 * @param parameter2
+     */
-	 * @return Variant result
+    public Variant invoke(String actionCommand, String parameter) {
-	 */
+        return Dispatch.call(this, actionCommand, parameter);
-	public Variant invoke(String actionCommand, String parameter1,
+    }
-			int parameter2) {
-		return Dispatch.call(this, actionCommand, parameter1, new Variant(
-				parameter2));
-	}
 
-	/**
+    /**
-	 * makes a dispatch call to the passed in action with two integer parameters
+     * makes a dispatch call to the passed in action with a single boolean
-	 * (this was put in for some application)
+     * parameter
-	 * 
+     * 
-	 * @param actionCommand
+     * @param actionCommand
-	 * @param parameter1
+     * @param parameter
-	 * @param parameter2
+     * @return Variant result
-	 * @return a Variant but that may be null for some calls
+     */
-	 */
+    public Variant invoke(String actionCommand, boolean parameter) {
-	public Variant invoke(String actionCommand, int parameter1, int parameter2) {
+        return Dispatch.call(this, actionCommand, new Variant(parameter));
-		return Dispatch.call(this, actionCommand, new Variant(parameter1),
+    }
-				new Variant(parameter2));
-	}
 
-	/**
+    /**
-	 * makes a dispatch call for the passed in action and no parameter
+     * makes a dispatch call to the passed in action with a single int parameter
-	 * 
+     * 
-	 * @param callAction
+     * @param actionCommand
-	 * @return a Variant but that may be null for some calls
+     * @param parameter
-	 */
+     * @return Variant result of the invoke (Dispatch.call)
-	public Variant invoke(String callAction) {
+     */
-		return Dispatch.call(this, callAction);
+    public Variant invoke(String actionCommand, int parameter) {
-	}
+        return Dispatch.call(this, actionCommand, new Variant(parameter));
+    }
 
-	/**
+    /**
-	 * This is really a cover for call(String,Variant[]) that should be
+     * makes a dispatch call to the passed in action with a string and integer
-	 * eliminated call with a variable number of args mainly used for quit.
+     * parameter (this was put in for some application)
-	 * 
+     * 
-	 * @param name
+     * @param actionCommand
-	 * @param args
+     * @param parameter1
-	 * @return Variant returned by the invoke (Dispatch.callN)
+     * @param parameter2
-	 */
+     * @return Variant result
-	public Variant invoke(String name, Variant... args) {
+     */
-		return Dispatch.callN(this, name, (Object[]) args);
+    public Variant invoke(String actionCommand, String parameter1,
-	}
+            int parameter2) {
+        return Dispatch.call(this, actionCommand, parameter1, new Variant(
+                parameter2));
+    }
+
+    /**
+     * makes a dispatch call to the passed in action with two integer parameters
+     * (this was put in for some application)
+     * 
+     * @param actionCommand
+     * @param parameter1
+     * @param parameter2
+     * @return a Variant but that may be null for some calls
+     */
+    public Variant invoke(String actionCommand, int parameter1, int parameter2) {
+        return Dispatch.call(this, actionCommand, new Variant(parameter1),
+                new Variant(parameter2));
+    }
+
+    /**
+     * makes a dispatch call for the passed in action and single parameter
+     * 
+     * @param callAction
+     * @param parameter
+     * @return a Variant but that may be null for some calls
+     */
+    public Variant invoke(String callAction, Variant parameter) {
+        return Dispatch.call(this, callAction, parameter);
+    }
+
+    /**
+     * makes a dispatch call for the passed in action and two parameter
+     * 
+     * @param callAction
+     * @param parameter1
+     * @param parameter2
+     * @return a Variant but that may be null for some calls
+     */
+    public Variant invoke(String callAction, Variant parameter1,
+            Variant parameter2) {
+        return Dispatch.call(this, callAction, parameter1, parameter2);
+    }
+
+    /**
+     * makes a dispatch call for the passed in action and two parameter
+     * 
+     * @param callAction
+     * @param parameter1
+     * @param parameter2
+     * @param parameter3
+     * @return Variant result data
+     */
+    public Variant invoke(String callAction, Variant parameter1,
+            Variant parameter2, Variant parameter3) {
+        return Dispatch.call(this, callAction, parameter1, parameter2,
+                parameter3);
+    }
+
+    /**
+     * calls call() with 4 variant parameters
+     * 
+     * @param callAction
+     * @param parameter1
+     * @param parameter2
+     * @param parameter3
+     * @param parameter4
+     * @return Variant result data
+     */
+    public Variant invoke(String callAction, Variant parameter1,
+            Variant parameter2, Variant parameter3, Variant parameter4) {
+        return Dispatch.call(this, callAction, parameter1, parameter2,
+                parameter3, parameter4);
+    }
+
+    /**
+     * makes a dispatch call for the passed in action and no parameter
+     * 
+     * @param callAction
+     * @return a Variant but that may be null for some calls
+     */
+    public Variant invoke(String callAction) {
+        return Dispatch.call(this, callAction);
+    }
+
+    /**
+     * This is really a cover for call(String,Variant[]) that should be
+     * eliminated call with a variable number of args mainly used for quit.
+     * 
+     * @param name
+     * @param args
+     * @return Variant returned by the invoke (Dispatch.callN)
+     */
+    public Variant invoke(String name, Variant[] args) {
+        return Dispatch.callN(this, name, args);
+    }
 
 }

src/main/java/com/jacob/activeX/ActiveXDispatchEvents.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.activeX;
 
@@ -35,72 +54,72 @@ import com.jacob.com.InvocationProxy;
  */
 public class ActiveXDispatchEvents extends DispatchEvents {
 
-	/**
+    /**
-	 * This is the most commonly used constructor.
+     * This is the most commonly used constructor.
-	 * <p>
+     * <p>
-	 * Creates the event callback linkage between the the MS program represented
+     * Creates the event callback linkage between the the MS program represented
-	 * by the Dispatch object and the Java object that will receive the
+     * by the Dispatch object and the Java object that will receive the
-	 * callback.
+     * callback.
-	 * 
+     * 
-	 * @param sourceOfEvent
+     * @param sourceOfEvent
-	 *            Dispatch object who's MS app will generate callbacks
+     *            Dispatch object who's MS app will generate callbacks
-	 * @param eventSink
+     * @param eventSink
-	 *            Java object that wants to receive the events
+     *            Java object that wants to receive the events
-	 */
+     */
-	public ActiveXDispatchEvents(Dispatch sourceOfEvent, Object eventSink) {
+    public ActiveXDispatchEvents(Dispatch sourceOfEvent, Object eventSink) {
-		super(sourceOfEvent, eventSink, null);
+        super(sourceOfEvent, eventSink, null);
-	}
+    }
 
-	/**
+    /**
-	 * None of the samples use this constructor.
+     * None of the samples use this constructor.
-	 * <p>
+     * <p>
-	 * Creates the event callback linkage between the the MS program represented
+     * Creates the event callback linkage between the the MS program represented
-	 * by the Dispatch object and the Java object that will receive the
+     * by the Dispatch object and the Java object that will receive the
-	 * callback.
+     * callback.
-	 * 
+     * 
-	 * @param sourceOfEvent
+     * @param sourceOfEvent
-	 *            Dispatch object who's MS app will generate callbacks
+     *            Dispatch object who's MS app will generate callbacks
-	 * @param eventSink
+     * @param eventSink
-	 *            Java object that wants to receive the events
+     *            Java object that wants to receive the events
-	 * @param progId
+     * @param progId
-	 *            ???
+     *            ???
-	 */
+     */
-	public ActiveXDispatchEvents(Dispatch sourceOfEvent, Object eventSink,
+    public ActiveXDispatchEvents(Dispatch sourceOfEvent, Object eventSink,
-			String progId) {
+            String progId) {
-		super(sourceOfEvent, eventSink, progId, null);
+        super(sourceOfEvent, eventSink, progId, null);
-	}
+    }
 
-	/**
+    /**
-	 * Creates the event callback linkage between the the MS program represented
+     * Creates the event callback linkage between the the MS program represented
-	 * by the Dispatch object and the Java object that will receive the
+     * by the Dispatch object and the Java object that will receive the
-	 * callback.
+     * callback.
-	 * 
+     * 
-	 * <pre>
+     * <pre>
-	 * &gt;ActiveXDispatchEvents de = 
+     * &gt;ActiveXDispatchEvents de = 
-	 * 			new ActiveXDispatchEvents(someDispatch,someEventHAndler,
+     *             new ActiveXDispatchEvents(someDispatch,someEventHAndler,
-	 * 				&quot;Excel.Application&quot;,
+     *                 &quot;Excel.Application&quot;,
-	 * 				&quot;C:\\Program Files\\Microsoft Office\\OFFICE11\\EXCEL.EXE&quot;);
+     *                 &quot;C:\\Program Files\\Microsoft Office\\OFFICE11\\EXCEL.EXE&quot;);
-	 * 
+     * 
-	 * @param sourceOfEvent Dispatch object who's MS app will generate callbacks
+     * @param sourceOfEvent Dispatch object who's MS app will generate callbacks
-	 * @param eventSink Java object that wants to receive the events
+     * @param eventSink Java object that wants to receive the events
-	 * @param progId , mandatory if the typelib is specified
+     * @param progId , mandatory if the typelib is specified
-	 * @param typeLib The location of the typelib to use
+     * @param typeLib The location of the typelib to use
-	 * 
+     * 
-	 */
+     */
-	public ActiveXDispatchEvents(Dispatch sourceOfEvent, Object eventSink,
+    public ActiveXDispatchEvents(Dispatch sourceOfEvent, Object eventSink,
-			String progId, String typeLib) {
+            String progId, String typeLib) {
-		super(sourceOfEvent, eventSink, progId, typeLib);
+        super(sourceOfEvent, eventSink, progId, typeLib);
-	}
+    }
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see com.jacob.com.DispatchEvents#getInvocationProxy(java.lang.Object)
+     * @see com.jacob.com.DispatchEvents#getInvocationProxy(java.lang.Object)
-	 */
+     */
-	protected InvocationProxy getInvocationProxy(Object pTargetObject) {
+    protected InvocationProxy getInvocationProxy(Object pTargetObject) {
-		InvocationProxy newProxy = new ActiveXInvocationProxy();
+        InvocationProxy newProxy = new ActiveXInvocationProxy();
-		newProxy.setTarget(pTargetObject);
+        newProxy.setTarget(pTargetObject);
-		return newProxy;
+        return newProxy;
-	}
+    }
 
 }

src/main/java/com/jacob/activeX/ActiveXInvocationProxy.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.activeX;
 
@@ -53,131 +72,131 @@ import com.jacob.com.Variant;
  */
 public class ActiveXInvocationProxy extends InvocationProxy {
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see com.jacob.com.InvocationProxy#invoke(java.lang.String,
+     * @see com.jacob.com.InvocationProxy#invoke(java.lang.String,
-	 *      com.jacob.com.Variant[])
+     *      com.jacob.com.Variant[])
-	 */
+     */
-	@SuppressWarnings("unchecked")
+    @SuppressWarnings("unchecked")
-	public Variant invoke(String methodName, Variant targetParameters[]) {
+    public Variant invoke(String methodName, Variant targetParameters[]) {
-		Variant mVariantToBeReturned = null;
+        Variant mVariantToBeReturned = null;
-		if (mTargetObject == null) {
+        if (mTargetObject == null) {
-			// structured programming guidlines say this return should not be up
+            // structured programming guidlines say this return should not be up
-			// here
+            // here
-			return null;
+            return null;
-		}
+        }
-		Class targetClass = mTargetObject.getClass();
+        Class targetClass = mTargetObject.getClass();
-		if (methodName == null) {
+        if (methodName == null) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"InvocationProxy: missing method name");
+                    "InvocationProxy: missing method name");
-		}
+        }
-		if (targetParameters == null) {
+        if (targetParameters == null) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"InvocationProxy: missing Variant parameters");
+                    "InvocationProxy: missing Variant parameters");
-		}
+        }
-		try {
+        try {
-			Method targetMethod;
+            Method targetMethod;
-			Object parametersAsJavaObjects[] = getParametersAsJavaObjects(targetParameters);
+            Object parametersAsJavaObjects[] = getParametersAsJavaObjects(targetParameters);
-			Class parametersAsJavaClasses[] = getParametersAsJavaClasses(parametersAsJavaObjects);
+            Class parametersAsJavaClasses[] = getParametersAsJavaClasses(parametersAsJavaObjects);
-			targetMethod = targetClass.getMethod(methodName,
+            targetMethod = targetClass.getMethod(methodName,
-					parametersAsJavaClasses);
+                    parametersAsJavaClasses);
-			if (targetMethod != null) {
+            if (targetMethod != null) {
-				// protected classes can't be invoked against even if they
+                // protected classes can't be invoked against even if they
-				// let you grab the method. you could do
+                // let you grab the method. you could do
-				// targetMethod.setAccessible(true);
+                // targetMethod.setAccessible(true);
-				// but that should be stopped by the security manager
+                // but that should be stopped by the security manager
-				Object mReturnedByInvocation = null;
+                Object mReturnedByInvocation = null;
-				mReturnedByInvocation = targetMethod.invoke(mTargetObject,
+                mReturnedByInvocation = targetMethod.invoke(mTargetObject,
-						parametersAsJavaObjects);
+                        parametersAsJavaObjects);
-				if (mReturnedByInvocation == null) {
+                if (mReturnedByInvocation == null) {
-					mVariantToBeReturned = null;
+                    mVariantToBeReturned = null;
-				} else if (!(mReturnedByInvocation instanceof Variant)) {
+                } else if (!(mReturnedByInvocation instanceof Variant)) {
-					mVariantToBeReturned = new Variant(mReturnedByInvocation);
+                    mVariantToBeReturned = new Variant(mReturnedByInvocation);
-				} else {
+                } else {
-					mVariantToBeReturned = (Variant) mReturnedByInvocation;
+                    mVariantToBeReturned = (Variant) mReturnedByInvocation;
-				}
+                }
-			}
+            }
-		} catch (SecurityException e) {
+        } catch (SecurityException e) {
-			// what causes this exception?
+            // what causes this exception?
-			e.printStackTrace();
+            e.printStackTrace();
-		} catch (NoSuchMethodException e) {
+        } catch (NoSuchMethodException e) {
-			// this happens whenever the listener doesn't implement all the
+            // this happens whenever the listener doesn't implement all the
-			// methods
+            // methods
-		} catch (IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
-			// we can throw these inside the catch block so need to re-throw it
+            // we can throw these inside the catch block so need to re-throw it
-			Exception oneWeShouldToss = new IllegalArgumentException(
+            Exception oneWeShouldToss = new IllegalArgumentException(
-					"Unable to map parameters for method " + methodName + ": "
+                    "Unable to map parameters for method " + methodName + ": "
-							+ e.toString());
+                            + e.toString());
-			oneWeShouldToss.printStackTrace();
+            oneWeShouldToss.printStackTrace();
-		} catch (IllegalAccessException e) {
+        } catch (IllegalAccessException e) {
-			// can't access the method on the target instance for some reason
+            // can't access the method on the target instance for some reason
-			e.printStackTrace();
+            e.printStackTrace();
-		} catch (InvocationTargetException e) {
+        } catch (InvocationTargetException e) {
-			// invocation of target method failed
+            // invocation of target method failed
-			e.printStackTrace();
+            e.printStackTrace();
-		}
+        }
-		return mVariantToBeReturned;
+        return mVariantToBeReturned;
 
-	}
+    }
 
-	/**
+    /**
-	 * creates a method signature compatible array of classes from an array of
+     * creates a method signature compatible array of classes from an array of
-	 * parameters
+     * parameters
-	 * 
+     * 
-	 * @param parametersAsJavaObjects
+     * @param parametersAsJavaObjects
-	 * @return
+     * @return
-	 */
+     */
-	@SuppressWarnings("unchecked")
+    @SuppressWarnings("unchecked")
-	private Class[] getParametersAsJavaClasses(Object[] parametersAsJavaObjects) {
+    private Class[] getParametersAsJavaClasses(Object[] parametersAsJavaObjects) {
-		if (parametersAsJavaObjects == null) {
+        if (parametersAsJavaObjects == null) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"This only works with an array of parameters");
+                    "This only works with an array of parameters");
-		}
+        }
-		int numParameters = parametersAsJavaObjects.length;
+        int numParameters = parametersAsJavaObjects.length;
-		Class parametersAsJavaClasses[] = new Class[numParameters];
+        Class parametersAsJavaClasses[] = new Class[numParameters];
-		for (int parameterIndex = 0; parameterIndex < numParameters; parameterIndex++) {
+        for (int parameterIndex = 0; parameterIndex < numParameters; parameterIndex++) {
-			Object oneParameterObject = parametersAsJavaObjects[parameterIndex];
+            Object oneParameterObject = parametersAsJavaObjects[parameterIndex];
-			if (oneParameterObject == null) {
+            if (oneParameterObject == null) {
-				parametersAsJavaClasses[parameterIndex] = null;
+                parametersAsJavaClasses[parameterIndex] = null;
-			} else {
+            } else {
-				Class oneParameterClass = oneParameterObject.getClass();
+                Class oneParameterClass = oneParameterObject.getClass();
-				parametersAsJavaClasses[parameterIndex] = oneParameterClass;
+                parametersAsJavaClasses[parameterIndex] = oneParameterClass;
-			}
+            }
-		}
+        }
-		return parametersAsJavaClasses;
+        return parametersAsJavaClasses;
-	}
+    }
 
-	/**
+    /**
-	 * converts an array of Variants to their associated Java types
+     * converts an array of Variants to their associated Java types
-	 * 
+     * 
-	 * @param targetParameters
+     * @param targetParameters
-	 * @return
+     * @return
-	 */
+     */
-	private Object[] getParametersAsJavaObjects(Variant[] targetParameters) {
+    private Object[] getParametersAsJavaObjects(Variant[] targetParameters) {
-		if (targetParameters == null) {
+        if (targetParameters == null) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"This only works with an array of parameters");
+                    "This only works with an array of parameters");
-		}
+        }
-		int numParameters = targetParameters.length;
+        int numParameters = targetParameters.length;
-		Object parametersAsJavaObjects[] = new Object[numParameters];
+        Object parametersAsJavaObjects[] = new Object[numParameters];
-		for (int parameterIndex = 0; parameterIndex < numParameters; parameterIndex++) {
+        for (int parameterIndex = 0; parameterIndex < numParameters; parameterIndex++) {
-			Variant oneParameterObject = targetParameters[parameterIndex];
+            Variant oneParameterObject = targetParameters[parameterIndex];
-			if (oneParameterObject == null) {
+            if (oneParameterObject == null) {
-				parametersAsJavaObjects[parameterIndex] = null;
+                parametersAsJavaObjects[parameterIndex] = null;
-			} else {
+            } else {
-				try {
+                try {
-					parametersAsJavaObjects[parameterIndex] = oneParameterObject
+                    parametersAsJavaObjects[parameterIndex] = oneParameterObject
-							.toJavaObject();
+                            .toJavaObject();
-				} catch (NotImplementedException nie) {
+                } catch (NotImplementedException nie) {
-					throw new IllegalArgumentException(
+                    throw new IllegalArgumentException(
-							"Can't convert parameter " + parameterIndex
+                            "Can't convert parameter " + parameterIndex
-									+ " type " + oneParameterObject.getvt()
+                                    + " type " + oneParameterObject.getvt()
-									+ " to java object: " + nie.getMessage());
+                                    + " to java object: " + nie.getMessage());
-				}
+                }
-			}
+            }
-		}
+        }
-		return parametersAsJavaObjects;
+        return parametersAsJavaObjects;
-	}
+    }
 
 }

src/main/java/com/jacob/com/.cvsignore

@@ -1,2 +0,0 @@
-*.class
-

src/main/java/com/jacob/com/ComException.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -24,118 +43,118 @@ package com.jacob.com;
  */
 public abstract class ComException extends JacobException {
 
-	/**
+    /**
-	 * COM code initializes this filed with an appropriate return code that was
+     * COM code initializes this filed with an appropriate return code that was
-	 * returned by the underlying com code
+     * returned by the underlying com code
-	 */
+     */
-	protected int hr;
+    protected int hr;
-	/**
+    /**
-	 * No documentation is available at this time. Someone should document this
+     * No documentation is available at this time. Someone should document this
-	 * field
+     * field
-	 */
+     */
-	protected int m_helpContext;
+    protected int m_helpContext;
-	/**
+    /**
-	 * No documentation is available at this time. Someone should document this
+     * No documentation is available at this time. Someone should document this
-	 * field
+     * field
-	 */
+     */
-	protected String m_helpFile;
+    protected String m_helpFile;
-	/**
+    /**
-	 * No documentation is available at this time. Someone should document this
+     * No documentation is available at this time. Someone should document this
-	 * field
+     * field
-	 */
+     */
-	protected String m_source;
+    protected String m_source;
 
-	/**
+    /**
-	 * constructor
+     * constructor
-	 * 
+     * 
-	 */
+     */
-	public ComException() {
+    public ComException() {
-		super();
+        super();
-	}
+    }
 
-	/**
+    /**
-	 * constructor with error code?
+     * constructor with error code?
-	 * 
+     * 
-	 * @param newHr ??
+     * @param newHr ??
-	 */
+     */
-	public ComException(int newHr) {
+    public ComException(int newHr) {
-		super();
+        super();
-		this.hr = newHr;
+        this.hr = newHr;
-	}
+    }
 
-	/**
+    /**
-	 * @param newHr
+     * @param newHr
-	 * @param description
+     * @param description
-	 */
+     */
-	public ComException(int newHr, String description) {
+    public ComException(int newHr, String description) {
-		super(description);
+        super(description);
-		this.hr = newHr;
+        this.hr = newHr;
-	}
+    }
 
-	/**
+    /**
-	 * @param newHr
+     * @param newHr
-	 * @param source
+     * @param source
-	 * @param helpFile
+     * @param helpFile
-	 * @param helpContext
+     * @param helpContext
-	 */
+     */
-	public ComException(int newHr, String source, String helpFile,
+    public ComException(int newHr, String source, String helpFile,
-			int helpContext) {
+            int helpContext) {
-		super();
+        super();
-		this.hr = newHr;
+        this.hr = newHr;
-		m_source = source;
+        m_source = source;
-		m_helpFile = helpFile;
+        m_helpFile = helpFile;
-		m_helpContext = helpContext;
+        m_helpContext = helpContext;
-	}
+    }
 
-	/**
+    /**
-	 * @param newHr
+     * @param newHr
-	 * @param description
+     * @param description
-	 * @param source
+     * @param source
-	 * @param helpFile
+     * @param helpFile
-	 * @param helpContext
+     * @param helpContext
-	 */
+     */
-	public ComException(int newHr, String description, String source,
+    public ComException(int newHr, String description, String source,
-			String helpFile, int helpContext) {
+            String helpFile, int helpContext) {
-		super(description);
+        super(description);
-		this.hr = newHr;
+        this.hr = newHr;
-		m_source = source;
+        m_source = source;
-		m_helpFile = helpFile;
+        m_helpFile = helpFile;
-		m_helpContext = helpContext;
+        m_helpContext = helpContext;
-	}
+    }
 
-	/**
+    /**
-	 * @param description
+     * @param description
-	 */
+     */
-	public ComException(String description) {
+    public ComException(String description) {
-		super(description);
+        super(description);
-	}
+    }
 
-	/**
+    /**
-	 * @return int representation of the help context
+     * @return int representation of the help context
-	 */
+     */
-	// Methods
+    // Methods
-	public int getHelpContext() {
+    public int getHelpContext() {
-		return m_helpContext;
+        return m_helpContext;
-	}
+    }
 
-	/**
+    /**
-	 * @return String ??? help file
+     * @return String ??? help file
-	 */
+     */
-	public String getHelpFile() {
+    public String getHelpFile() {
-		return m_helpFile;
+        return m_helpFile;
-	}
+    }
 
-	/**
+    /**
-	 * @return int hr result ??
+     * @return int hr result ??
-	 */
+     */
-	public int getHResult() {
+    public int getHResult() {
-		return hr;
+        return hr;
-	}
+    }
 
-	/**
+    /**
-	 * @return String source ??
+     * @return String source ??
-	 */
+     */
-	public String getSource() {
+    public String getSource() {
-		return m_source;
+        return m_source;
-	}
+    }
 }

src/main/java/com/jacob/com/ComFailException.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -23,66 +42,66 @@ package com.jacob.com;
  * COM Fail Exception class raised when there is a problem
  */
 public class ComFailException extends ComException {
-	/**
+    /**
-	 * eclipse generated to get rid of a wanring
+     * eclipse generated to get rid of a wanring
-	 */
+     */
-	private static final long serialVersionUID = -266047261992987700L;
+    private static final long serialVersionUID = -266047261992987700L;
 
-	/**
+    /**
-	 * Constructor
+     * Constructor
-	 * 
+     * 
-	 * @param hrNew
+     * @param hrNew
-	 */
+     */
-	public ComFailException(int hrNew) {
+    public ComFailException(int hrNew) {
-		super(hrNew);
+        super(hrNew);
-	}
+    }
 
-	/**
+    /**
-	 * Constructor
+     * Constructor
-	 * 
+     * 
-	 * @param hrNew
+     * @param hrNew
-	 * @param message
+     * @param message
-	 */
+     */
-	public ComFailException(int hrNew, String message) {
+    public ComFailException(int hrNew, String message) {
-		super(hrNew, message);
+        super(hrNew, message);
-	}
+    }
 
-	/**
+    /**
-	 * @param hrNew
+     * @param hrNew
-	 * @param source
+     * @param source
-	 * @param helpFile
+     * @param helpFile
-	 * @param helpContext
+     * @param helpContext
-	 */
+     */
-	public ComFailException(int hrNew, String source, String helpFile,
+    public ComFailException(int hrNew, String source, String helpFile,
-			int helpContext) {
+            int helpContext) {
-		super(hrNew, source, helpFile, helpContext);
+        super(hrNew, source, helpFile, helpContext);
-	}
+    }
 
-	/**
+    /**
-	 * Constructor
+     * Constructor
-	 * 
+     * 
-	 * @param hrNew
+     * @param hrNew
-	 * @param description
+     * @param description
-	 * @param source
+     * @param source
-	 * @param helpFile
+     * @param helpFile
-	 * @param helpContext
+     * @param helpContext
-	 */
+     */
-	public ComFailException(int hrNew, String description, String source,
+    public ComFailException(int hrNew, String description, String source,
-			String helpFile, int helpContext) {
+            String helpFile, int helpContext) {
-		super(hrNew, description, source, helpFile, helpContext);
+        super(hrNew, description, source, helpFile, helpContext);
-	}
+    }
 
-	/**
+    /**
-	 * No argument Constructor
+     * No argument Constructor
-	 */
+     */
-	public ComFailException() {
+    public ComFailException() {
-		super();
+        super();
-	}
+    }
 
-	/**
+    /**
-	 * @param message
+     * @param message
-	 */
+     */
-	public ComFailException(String message) {
+    public ComFailException(String message) {
-		super(message);
+        super(message);
-	}
+    }
 }

src/main/java/com/jacob/com/ComThread.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -24,146 +43,146 @@ package com.jacob.com;
  * methods are static and no instances are ever created.
  */
 public abstract class ComThread {
-	private static final int MTA = 0x0;
+    private static final int MTA = 0x0;
 
-	private static final int STA = 0x2;
+    private static final int STA = 0x2;
 
-	/**
+    /**
-	 * Comment for <code>haveSTA</code>
+     * Comment for <code>haveSTA</code>
-	 */
+     */
-	public static boolean haveSTA = false;
+    public static boolean haveSTA = false;
 
-	/**
+    /**
-	 * Comment for <code>mainSTA</code>
+     * Comment for <code>mainSTA</code>
-	 */
+     */
-	public static MainSTA mainSTA = null;
+    public static MainSTA mainSTA = null;
 
-	/**
+    /**
-	 * Initialize the current java thread to be part of the Multi-threaded COM
+     * Initialize the current java thread to be part of the Multi-threaded COM
-	 * Apartment
+     * Apartment
-	 */
+     */
-	public static synchronized void InitMTA() {
+    public static synchronized void InitMTA() {
-		InitMTA(false);
+        InitMTA(false);
-	}
+    }
 
-	/**
+    /**
-	 * Initialize the current java thread to be an STA
+     * Initialize the current java thread to be an STA
-	 */
+     */
-	public static synchronized void InitSTA() {
+    public static synchronized void InitSTA() {
-		InitSTA(false);
+        InitSTA(false);
-	}
+    }
 
-	/**
+    /**
-	 * Initialize the current java thread to be part of the Multi-threaded COM
+     * Initialize the current java thread to be part of the Multi-threaded COM
-	 * Apartment, if createMainSTA is true, create a separate MainSTA thread
+     * Apartment, if createMainSTA is true, create a separate MainSTA thread
-	 * that will house all Apartment Threaded components
+     * that will house all Apartment Threaded components
-	 * 
+     * 
-	 * @param createMainSTA
+     * @param createMainSTA
-	 */
+     */
-	public static synchronized void InitMTA(boolean createMainSTA) {
+    public static synchronized void InitMTA(boolean createMainSTA) {
-		Init(createMainSTA, MTA);
+        Init(createMainSTA, MTA);
-	}
+    }
 
-	/**
+    /**
-	 * Initialize the current java thread to be an STA COM Apartment, if
+     * Initialize the current java thread to be an STA COM Apartment, if
-	 * createMainSTA is true, create a separate MainSTA thread that will house
+     * createMainSTA is true, create a separate MainSTA thread that will house
-	 * all Apartment Threaded components
+     * all Apartment Threaded components
-	 * 
+     * 
-	 * @param createMainSTA
+     * @param createMainSTA
-	 */
+     */
-	public static synchronized void InitSTA(boolean createMainSTA) {
+    public static synchronized void InitSTA(boolean createMainSTA) {
-		Init(createMainSTA, STA);
+        Init(createMainSTA, STA);
-	}
+    }
 
-	/**
+    /**
-	 * 
+     * 
-	 */
+     */
-	public static synchronized void startMainSTA() {
+    public static synchronized void startMainSTA() {
-		mainSTA = new MainSTA();
+        mainSTA = new MainSTA();
-		haveSTA = true;
+        haveSTA = true;
-	}
+    }
 
-	/**
+    /**
-	 * 
+     * 
-	 */
+     */
-	public static synchronized void quitMainSTA() {
+    public static synchronized void quitMainSTA() {
-		if (mainSTA != null)
+        if (mainSTA != null)
-			mainSTA.quit();
+            mainSTA.quit();
-	}
+    }
 
-	/**
+    /**
-	 * Initialize the current java thread to be part of the MTA/STA COM
+     * Initialize the current java thread to be part of the MTA/STA COM
-	 * Apartment
+     * Apartment
-	 * 
+     * 
-	 * @param createMainSTA
+     * @param createMainSTA
-	 * @param mode
+     * @param mode
-	 */
+     */
-	public static synchronized void Init(boolean createMainSTA, int mode) {
+    public static synchronized void Init(boolean createMainSTA, int mode) {
-		if (createMainSTA && !haveSTA) {
+        if (createMainSTA && !haveSTA) {
-			// if the current thread is going to be in the MTA and there
+            // if the current thread is going to be in the MTA and there
-			// is no STA thread yet, then create a main STA thread
+            // is no STA thread yet, then create a main STA thread
-			// to avoid COM creating its own
+            // to avoid COM creating its own
-			startMainSTA();
+            startMainSTA();
-		}
+        }
-		if (JacobObject.isDebugEnabled()) {
+        if (JacobObject.isDebugEnabled()) {
-			JacobObject.debug("ComThread: before Init: " + mode);
+            JacobObject.debug("ComThread: before Init: " + mode);
-		}
+        }
-		doCoInitialize(mode);
+        doCoInitialize(mode);
-		if (JacobObject.isDebugEnabled()) {
+        if (JacobObject.isDebugEnabled()) {
-			JacobObject.debug("ComThread: after Init: " + mode);
+            JacobObject.debug("ComThread: after Init: " + mode);
-		}
+        }
-		ROT.addThread();
+        ROT.addThread();
-		if (JacobObject.isDebugEnabled()) {
+        if (JacobObject.isDebugEnabled()) {
-			JacobObject.debug("ComThread: after ROT.addThread: " + mode);
+            JacobObject.debug("ComThread: after ROT.addThread: " + mode);
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Call CoUninitialize to release this java thread from COM
+     * Call CoUninitialize to release this java thread from COM
-	 */
+     */
-	public static synchronized void Release() {
+    public static synchronized void Release() {
-		if (JacobObject.isDebugEnabled()) {
+        if (JacobObject.isDebugEnabled()) {
-			JacobObject.debug("ComThread: before clearObjects");
+            JacobObject.debug("ComThread: before clearObjects");
-		}
+        }
-		ROT.clearObjects();
+        ROT.clearObjects();
-		if (JacobObject.isDebugEnabled()) {
+        if (JacobObject.isDebugEnabled()) {
-			JacobObject.debug("ComThread: before UnInit");
+            JacobObject.debug("ComThread: before UnInit");
-		}
+        }
-		doCoUninitialize();
+        doCoUninitialize();
-		if (JacobObject.isDebugEnabled()) {
+        if (JacobObject.isDebugEnabled()) {
-			JacobObject.debug("ComThread: after UnInit");
+            JacobObject.debug("ComThread: after UnInit");
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * @deprecated the java model leave the responsibility of clearing up
+     * @deprecated the java model leave the responsibility of clearing up
-	 *             objects to the Garbage Collector. Our programming model
+     *             objects to the Garbage Collector. Our programming model
-	 *             should not require that the user specifically remove object
+     *             should not require that the user specifically remove object
-	 *             from the thread.
+     *             from the thread.
-	 * 
+     * 
-	 * This will remove an object from the ROT
+     * This will remove an object from the ROT
-	 * @param o
+     * @param o
-	 */
+     */
-	@Deprecated
+    @Deprecated
-	public static synchronized void RemoveObject(JacobObject o) {
+    public static synchronized void RemoveObject(JacobObject o) {
-		ROT.removeObject(o);
+        ROT.removeObject(o);
-	}
+    }
 
-	/**
+    /**
-	 * @param threadModel
+     * @param threadModel
-	 */
+     */
-	public static native void doCoInitialize(int threadModel);
+    public static native void doCoInitialize(int threadModel);
 
-	/**
+    /**
-	 * 
+     * 
-	 */
+     */
-	public static native void doCoUninitialize();
+    public static native void doCoUninitialize();
 
-	/**
+    /**
-	 * load the Jacob DLL. We do this in case COMThread is called before any
+     * load the Jacob DLL. We do this in case COMThread is called before any
-	 * other reference to one of the JacboObject subclasses is made.
+     * other reference to one of the JacboObject subclasses is made.
-	 */
+     */
-	static {
+    static {
-		LibraryLoader.loadJacobLibrary();
+        LibraryLoader.loadJacobLibrary();
-	}
+    }
 }

src/main/java/com/jacob/com/Currency.java

@@ -1,3 +1,41 @@
+/**
+ * This file is part of jlibcom.
+ *
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
+ *
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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 jlibcom. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 package com.jacob.com;
 
 /**
@@ -11,81 +49,81 @@ package com.jacob.com;
  * In the future, this should convert to and from BigDecimal or Double
  */
 public class Currency {
-	Long embeddedValue = null;
+    Long embeddedValue = null;
 
-	/**
+    /**
-	 * constructor that takes a long already in COM representation
+     * constructor that takes a long already in COM representation
-	 * 
+     * 
-	 * @param newValue
+     * @param newValue
-	 */
+     */
-	public Currency(long newValue) {
+    public Currency(long newValue) {
-		embeddedValue = new Long(newValue);
+        embeddedValue = new Long(newValue);
-	}
+    }
 
-	/**
+    /**
-	 * constructor that takes a String already in COM representation
+     * constructor that takes a String already in COM representation
-	 * 
+     * 
-	 * @param newValue
+     * @param newValue
-	 */
+     */
-	public Currency(String newValue) {
+    public Currency(String newValue) {
-		embeddedValue = new Long(newValue);
+        embeddedValue = new Long(newValue);
-	}
+    }
 
-	/**
+    /**
-	 * 
+     * 
-	 * @return the currency as a primitive long
+     * @return the currency as a primitive long
-	 */
+     */
-	public long longValue() {
+    public long longValue() {
-		return embeddedValue.longValue();
+        return embeddedValue.longValue();
-	}
+    }
 
-	/**
+    /**
-	 * getter to the inner storage so that cmpareTo can work
+     * getter to the inner storage so that cmpareTo can work
-	 * 
+     * 
-	 * @return the embedded long value
+     * @return the embedded long value
-	 */
+     */
-	protected Long getLongValue() {
+    protected Long getLongValue() {
-		return embeddedValue;
+        return embeddedValue;
-	}
+    }
 
-	/**
+    /**
-	 * compares the values of two currencies
+     * compares the values of two currencies
-	 * 
+     * 
-	 * @param anotherCurrency
+     * @param anotherCurrency
-	 * @return the usual compareTo results
+     * @return the usual compareTo results
-	 */
+     */
-	public int compareTo(Currency anotherCurrency) {
+    public int compareTo(Currency anotherCurrency) {
-		return embeddedValue.compareTo(anotherCurrency.getLongValue());
+        return embeddedValue.compareTo(anotherCurrency.getLongValue());
-	}
+    }
 
-	/**
+    /**
-	 * standard comparison
+     * standard comparison
-	 * 
+     * 
-	 * @param o
+     * @param o
-	 *            must be Currency or Long
+     *            must be Currency or Long
-	 * @return the usual compareTo results
+     * @return the usual compareTo results
-	 */
+     */
-	public int compareTo(Object o) {
+    public int compareTo(Object o) {
-		if (o instanceof Currency) {
+        if (o instanceof Currency) {
-			return compareTo((Currency) o);
+            return compareTo((Currency) o);
-		} else if (o instanceof Long) {
+        } else if (o instanceof Long) {
-			return embeddedValue.compareTo((Long) o);
+            return embeddedValue.compareTo((Long) o);
-		} else
+        } else
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"Can only compare to Long and Currency not "
+                    "Can only compare to Long and Currency not "
-							+ o.getClass().getName());
+                            + o.getClass().getName());
-	}
+    }
 
-	/**
+    /**
-	 * {@inheritDoc}
+     * {@inheritDoc}
-	 */
+     */
-	public boolean equals(Object o) {
+    public boolean equals(Object o) {
-		if (o == null) {
+        if (o == null) {
-			return false;
+            return false;
-		} else if (compareTo(o) == 0) {
+        } else if (compareTo(o) == 0) {
-			return true;
+            return true;
-		} else {
+        } else {
-			return false;
+            return false;
-		}
+        }
-	}
+    }
 }

src/main/java/com/jacob/com/DateUtilities.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -30,76 +49,76 @@ import java.util.Date;
  */
 public class DateUtilities {
 
-	/**
+    /**
-	 * converts a windows time to a Java Date Object
+     * converts a windows time to a Java Date Object
-	 * 
+     * 
-	 * @param comTime
+     * @param comTime
-	 * @return Date object representing the windows time as specified in comTime
+     * @return Date object representing the windows time as specified in comTime
-	 */
+     */
-	static public Date convertWindowsTimeToDate(double comTime) {
+    static public Date convertWindowsTimeToDate(double comTime) {
-		return new Date(convertWindowsTimeToMilliseconds(comTime));
+        return new Date(convertWindowsTimeToMilliseconds(comTime));
-	}
+    }
 
-	/**
+    /**
-	 * Convert a COM time from functions Date(), Time(), Now() to a Java time
+     * Convert a COM time from functions Date(), Time(), Now() to a Java time
-	 * (milliseconds). Visual Basic time values are based to 30.12.1899, Java
+     * (milliseconds). Visual Basic time values are based to 30.12.1899, Java
-	 * time values are based to 1.1.1970 (= 0 milliseconds). The difference is
+     * time values are based to 1.1.1970 (= 0 milliseconds). The difference is
-	 * added to the Visual Basic value to get the corresponding Java value. The
+     * added to the Visual Basic value to get the corresponding Java value. The
-	 * Visual Basic double value reads: <day count delta since 30.12.1899>.<1
+     * Visual Basic double value reads: <day count delta since 30.12.1899>.<1
-	 * day percentage fraction>, e.g. "38100.6453" means: 38100 days since
+     * day percentage fraction>, e.g. "38100.6453" means: 38100 days since
-	 * 30.12.1899 plus (24 hours * 0.6453). Example usage:
+     * 30.12.1899 plus (24 hours * 0.6453). Example usage:
-	 * <code>Date javaDate = new Date(toMilliseconds (vbDate));</code>.
+     * <code>Date javaDate = new Date(toMilliseconds (vbDate));</code>.
-	 * 
+     * 
-	 * @param comTime
+     * @param comTime
-	 *            COM time.
+     *            COM time.
-	 * @return Java time.
+     * @return Java time.
-	 */
+     */
-	static public long convertWindowsTimeToMilliseconds(double comTime) {
+    static public long convertWindowsTimeToMilliseconds(double comTime) {
-		long result = 0;
+        long result = 0;
 
-		// code from jacobgen:
+        // code from jacobgen:
-		comTime = comTime - 25569D;
+        comTime = comTime - 25569D;
-		Calendar cal = Calendar.getInstance();
+        Calendar cal = Calendar.getInstance();
-		result = Math.round(86400000L * comTime)
+        result = Math.round(86400000L * comTime)
-				- cal.get(Calendar.ZONE_OFFSET);
+                - cal.get(Calendar.ZONE_OFFSET);
-		cal.setTime(new Date(result));
+        cal.setTime(new Date(result));
-		result -= cal.get(Calendar.DST_OFFSET);
+        result -= cal.get(Calendar.DST_OFFSET);
 
-		return result;
+        return result;
-	}// convertWindowsTimeToMilliseconds()
+    }// convertWindowsTimeToMilliseconds()
 
-	/**
+    /**
-	 * converts a java date to a windows time object (is this timezone safe?)
+     * converts a java date to a windows time object (is this timezone safe?)
-	 * 
+     * 
-	 * @param javaDate
+     * @param javaDate
-	 *            the java date to be converted to windows time
+     *            the java date to be converted to windows time
-	 * @return the double representing the date in a form windows understands
+     * @return the double representing the date in a form windows understands
-	 */
+     */
-	static public double convertDateToWindowsTime(Date javaDate) {
+    static public double convertDateToWindowsTime(Date javaDate) {
-		if (javaDate == null) {
+        if (javaDate == null) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"cannot convert null to windows time");
+                    "cannot convert null to windows time");
-		}
+        }
-		return convertMillisecondsToWindowsTime(javaDate.getTime());
+        return convertMillisecondsToWindowsTime(javaDate.getTime());
-	}
+    }
 
-	/**
+    /**
-	 * Convert a Java time to a COM time.
+     * Convert a Java time to a COM time.
-	 * 
+     * 
-	 * @param milliseconds
+     * @param milliseconds
-	 *            Java time.
+     *            Java time.
-	 * @return COM time.
+     * @return COM time.
-	 */
+     */
-	static public double convertMillisecondsToWindowsTime(long milliseconds) {
+    static public double convertMillisecondsToWindowsTime(long milliseconds) {
-		double result = 0.0;
+        double result = 0.0;
 
-		// code from jacobgen:
+        // code from jacobgen:
-		Calendar cal = Calendar.getInstance();
+        Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(milliseconds);
+        cal.setTimeInMillis(milliseconds);
-		milliseconds += (cal.get(Calendar.ZONE_OFFSET) + cal
+        milliseconds += (cal.get(Calendar.ZONE_OFFSET) + cal
-				.get(Calendar.DST_OFFSET)); // add GMT offset
+                .get(Calendar.DST_OFFSET)); // add GMT offset
-		result = (milliseconds / 86400000D) + 25569D;
+        result = (milliseconds / 86400000D) + 25569D;
 
-		return result;
+        return result;
-	}// convertMillisecondsToWindowsTime()
+    }// convertMillisecondsToWindowsTime()
 }

src/main/java/com/jacob/com/DispatchEvents.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -40,182 +59,180 @@ package com.jacob.com;
  */
 public class DispatchEvents extends JacobObject {
 
-	/**
+    /**
-	 * pointer to an MS data struct. The COM layer knows the name of this
+     * pointer to an MS data struct. The COM layer knows the name of this
-	 * variable and puts the windows memory pointer here.
+     * variable and puts the windows memory pointer here.
-	 */
+     */
-	long m_pConnPtProxy = 0;
+    int m_pConnPtProxy = 0;
 
-	/**
+    /**
-	 * the wrapper for the event sink. This object is the one that will be sent
+     * the wrapper for the event sink. This object is the one that will be sent
-	 * a message when an event occurs in the MS layer. Normally, the
+     * a message when an event occurs in the MS layer. Normally, the
-	 * InvocationProxy will forward the messages to a wrapped object that it
+     * InvocationProxy will forward the messages to a wrapped object that it
-	 * contains.
+     * contains.
-	 */
+     */
-	InvocationProxy mInvocationProxy = null;
+    InvocationProxy mInvocationProxy = null;
 
-	/**
+    /**
-	 * This is the most commonly used constructor.
+     * This is the most commonly used constructor.
-	 * <p>
+     * <p>
-	 * Creates the event callback linkage between the the MS program represented
+     * Creates the event callback linkage between the the MS program represented
-	 * by the Dispatch object and the Java object that will receive the
+     * by the Dispatch object and the Java object that will receive the
-	 * callback.
+     * callback.
-	 * <p>
+     * <p>
-	 * Can be used on any object that implements IProvideClassInfo.
+     * Can be used on any object that implements IProvideClassInfo.
-	 * 
+     * 
-	 * @param sourceOfEvent
+     * @param sourceOfEvent
-	 *            Dispatch object who's MS app will generate callbacks
+     *            Dispatch object who's MS app will generate callbacks
-	 * @param eventSink
+     * @param eventSink
-	 *            Java object that wants to receive the events
+     *            Java object that wants to receive the events
-	 */
+     */
-	public DispatchEvents(Dispatch sourceOfEvent, Object eventSink) {
+    public DispatchEvents(Dispatch sourceOfEvent, Object eventSink) {
-		this(sourceOfEvent, eventSink, null);
+        this(sourceOfEvent, eventSink, null);
-	}
+    }
 
-	/**
+    /**
-	 * None of the samples use this constructor.
+     * None of the samples use this constructor.
-	 * <p>
+     * <p>
-	 * Creates the event callback linkage between the the MS program represented
+     * Creates the event callback linkage between the the MS program represented
-	 * by the Dispatch object and the Java object that will receive the
+     * by the Dispatch object and the Java object that will receive the
-	 * callback.
+     * callback.
-	 * <p>
+     * <p>
-	 * Used when the program doesn't implement IProvideClassInfo. It provides a
+     * Used when the program doesn't implement IProvideClassInfo. It provides a
-	 * way to find the TypeLib in the registry based on the programId. The
+     * way to find the TypeLib in the registry based on the programId. The
-	 * TypeLib is looked up in the registry on the path
+     * TypeLib is looked up in the registry on the path
-	 * HKEY_LOCAL_MACHINE/SOFTWARE/Classes/CLSID/(CLID drived from
+     * HKEY_LOCAL_MACHINE/SOFTWARE/Classes/CLSID/(CLID drived from
-	 * progid)/ProgID/Typelib
+     * progid)/ProgID/Typelib
-	 * 
+     * 
-	 * @param sourceOfEvent
+     * @param sourceOfEvent
-	 *            Dispatch object who's MS app will generate callbacks
+     *            Dispatch object who's MS app will generate callbacks
-	 * @param eventSink
+     * @param eventSink
-	 *            Java object that wants to receive the events
+     *            Java object that wants to receive the events
-	 * @param progId
+     * @param progId
-	 *            program id in the registry that has a TypeLib subkey. The
+     *            program id in the registry that has a TypeLib subkey. The
-	 *            progrId is mapped to a CLSID that is they used to look up the
+     *            progrId is mapped to a CLSID that is they used to look up the
-	 *            key to the Typelib
+     *            key to the Typelib
-	 */
+     */
-	public DispatchEvents(Dispatch sourceOfEvent, Object eventSink,
+    public DispatchEvents(Dispatch sourceOfEvent, Object eventSink,
-			String progId) {
+            String progId) {
-		this(sourceOfEvent, eventSink, progId, null);
+        this(sourceOfEvent, eventSink, progId, null);
-	}
+    }
 
-	/**
+    /**
-	 * Creates the event callback linkage between the the MS program represented
+     * Creates the event callback linkage between the the MS program represented
-	 * by the Dispatch object and the Java object that will receive the
+     * by the Dispatch object and the Java object that will receive the
-	 * callback.
+     * callback.
-	 * <p>
+     * <p>
-	 * This method was added because Excel doesn't implement IProvideClassInfo
+     * This method was added because Excel doesn't implement IProvideClassInfo
-	 * and the registry entry for Excel.Application doesn't include a typelib
+     * and the registry entry for Excel.Application doesn't include a typelib
-	 * key.
+     * key.
-	 * 
+     * 
-	 * <pre>
+     * <pre>
-	 * DispatchEvents de = new DispatchEvents(someDispatch, someEventHAndler,
+     * DispatchEvents de = new DispatchEvents(someDispatch, someEventHAndler,
-	 * 		&quot;Excel.Application&quot;,
+     *         &quot;Excel.Application&quot;,
-	 * 		&quot;C:\\Program Files\\Microsoft Office\\OFFICE11\\EXCEL.EXE&quot;);
+     *         &quot;C:\\Program Files\\Microsoft Office\\OFFICE11\\EXCEL.EXE&quot;);
-	 * </pre>
+     * </pre>
-	 * 
+     * 
-	 * @param sourceOfEvent
+     * @param sourceOfEvent
-	 *            Dispatch object who's MS app will generate callbacks
+     *            Dispatch object who's MS app will generate callbacks
-	 * @param eventSink
+     * @param eventSink
-	 *            Java object that wants to receive the events
+     *            Java object that wants to receive the events
-	 * @param progId
+     * @param progId ,
-	 *            , mandatory if the typelib is specified
+     *            mandatory if the typelib is specified
-	 * @param typeLib
+     * @param typeLib
-	 *            The location of the typelib to use
+     *            The location of the typelib to use
-	 */
+     */
-	public DispatchEvents(Dispatch sourceOfEvent, Object eventSink,
+    public DispatchEvents(Dispatch sourceOfEvent, Object eventSink,
-			String progId, String typeLib) {
+            String progId, String typeLib) {
-		if (JacobObject.isDebugEnabled()) {
+        if (JacobObject.isDebugEnabled()) {
-			System.out.println("DispatchEvents: Registering " + eventSink
+            System.out.println("DispatchEvents: Registering " + eventSink
-					+ "for events ");
+                    + "for events ");
-		}
+        }
-		if (eventSink instanceof InvocationProxy) {
+        if (eventSink instanceof InvocationProxy) {
-			mInvocationProxy = (InvocationProxy) eventSink;
+            mInvocationProxy = (InvocationProxy) eventSink;
-		} else {
+        } else {
-			mInvocationProxy = getInvocationProxy(eventSink);
+            mInvocationProxy = getInvocationProxy(eventSink);
-		}
+        }
-		if (mInvocationProxy != null) {
+        if (mInvocationProxy != null) {
-			init3(sourceOfEvent, mInvocationProxy, progId, typeLib);
+            init3(sourceOfEvent, mInvocationProxy, progId, typeLib);
-		} else {
+        } else {
-			if (JacobObject.isDebugEnabled()) {
+            if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("Cannot register null event sink for events");
+                JacobObject.debug("Cannot register null event sink for events");
-			}
+            }
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"Cannot register null event sink for events");
+                    "Cannot register null event sink for events");
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Returns an instance of the proxy configured with pTargetObject as its
+     * Returns an instance of the proxy configured with pTargetObject as its
-	 * target
+     * target
-	 * 
+     * 
-	 * @param pTargetObject
+     * @param pTargetObject
-	 * @return InvocationProxy an instance of the proxy this DispatchEvents will
+     * @return InvocationProxy an instance of the proxy this DispatchEvents will
-	 *         send to the COM layer
+     *         send to the COM layer
-	 */
+     */
-	protected InvocationProxy getInvocationProxy(Object pTargetObject) {
+    protected InvocationProxy getInvocationProxy(Object pTargetObject) {
-		InvocationProxy newProxy = new InvocationProxyAllVariants();
+        InvocationProxy newProxy = new InvocationProxyAllVariants();
-		newProxy.setTarget(pTargetObject);
+        newProxy.setTarget(pTargetObject);
-		return newProxy;
+        return newProxy;
-	}
+    }
 
-	/**
+    /**
-	 * hooks up a connection point proxy by progId event methods on the sink
+     * hooks up a connection point proxy by progId event methods on the sink
-	 * object will be called by name with a signature of <name>(Variant[] args)
+     * object will be called by name with a signature of <name>(Variant[] args)
-	 * 
+     * 
-	 * You must specify the location of the typeLib.
+     * You must specify the location of the typeLib.
-	 * 
+     * 
-	 * @param src
+     * @param src
-	 *            dispatch that is the source of the messages
+     *            dispatch that is the source of the messages
-	 * @param sink
+     * @param sink
-	 *            the object that will receive the messages
+     *            the object that will receive the messages
-	 * @param progId
+     * @param progId
-	 *            optional program id. most folks don't need this either
+     *            optional program id. most folks don't need this either
-	 * @param typeLib
+     * @param typeLib
-	 *            optional parameter for those programs that don't register
+     *            optional parameter for those programs that don't register
-	 *            their type libs (like Excel)
+     *            their type libs (like Excel)
-	 */
+     */
-	private native void init3(Dispatch src, Object sink, String progId,
+    private native void init3(Dispatch src, Object sink, String progId,
-			String typeLib);
+            String typeLib);
 
-	/**
+    /**
-	 * now private so only this object can asccess was: call this to explicitly
+     * now private so only this object can asccess was: call this to explicitly
-	 * release the com object before gc
+     * release the com object before gc
-	 * 
+     * 
-	 */
+     */
-	private native void release();
+    private native void release();
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see java.lang.Object#finalize()
+     * @see java.lang.Object#finalize()
-	 */
+     */
-	@Override
+    protected void finalize() {
-	protected void finalize() {
+        safeRelease();
-		safeRelease();
+    }
-	}
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see com.jacob.com.JacobObject#safeRelease()
+     * @see com.jacob.com.JacobObject#safeRelease()
-	 */
+     */
-	@Override
+    public void safeRelease() {
-	public void safeRelease() {
+        if (mInvocationProxy != null) {
-		if (mInvocationProxy != null) {
+            mInvocationProxy.setTarget(null);
-			mInvocationProxy.setTarget(null);
+        }
-		}
+        mInvocationProxy = null;
-		mInvocationProxy = null;
+        super.safeRelease();
-		super.safeRelease();
+        if (m_pConnPtProxy != 0) {
-		if (m_pConnPtProxy != 0) {
+            release();
-			release();
+            m_pConnPtProxy = 0;
-			m_pConnPtProxy = 0;
+        } else {
-		} else {
+            // looks like a double release
-			// looks like a double release
+            if (isDebugEnabled()) {
-			if (isDebugEnabled()) {
+                debug("DispatchEvents:" + this.hashCode() + " double release");
-				debug("DispatchEvents:" + this.hashCode() + " double release");
+            }
-			}
+        }
-		}
+    }
-	}
 
 }

src/main/java/com/jacob/com/DispatchIdentifier.java

@@ -1,3 +1,41 @@
+/**
+ * This file is part of jlibcom.
+ *
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
+ *
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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 jlibcom. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 /**
  * 
  */
@@ -9,74 +47,74 @@ package com.jacob.com;
  */
 public class DispatchIdentifier {
 
-	private DispatchIdentifier() {
+    private DispatchIdentifier() {
-		// This is utility class so there is no constructor.
+        // This is utility class so there is no constructor.
-	}
+    }
 
-	public static final int DISPID_UNKNOWN = -1;
+    public static final int DISPID_UNKNOWN = -1;
-	public static final int DISPID_VALUE = 0;
+    public static final int DISPID_VALUE = 0;
-	public static final int DISPID_PROPERTYPUT = -3;
+    public static final int DISPID_PROPERTYPUT = -3;
-	public static final int DISPID_NEWENUM = -4;
+    public static final int DISPID_NEWENUM = -4;
-	public static final int DISPID_EVALUATE = -5;
+    public static final int DISPID_EVALUATE = -5;
-	public static final int DISPID_CONSTRUCTOR = -6;
+    public static final int DISPID_CONSTRUCTOR = -6;
-	public static final int DISPID_DESTRUCTOR = -7;
+    public static final int DISPID_DESTRUCTOR = -7;
-	public static final int DISPID_COLLECT = -8;
+    public static final int DISPID_COLLECT = -8;
-	public static final int DISPID_AUTOSIZE = -500;
+    public static final int DISPID_AUTOSIZE = -500;
-	public static final int DISPID_BACKCOLOR = -501;
+    public static final int DISPID_BACKCOLOR = -501;
-	public static final int DISPID_BACKSTYLE = -502;
+    public static final int DISPID_BACKSTYLE = -502;
-	public static final int DISPID_BORDERCOLOR = -503;
+    public static final int DISPID_BORDERCOLOR = -503;
-	public static final int DISPID_BORDERSTYLE = -504;
+    public static final int DISPID_BORDERSTYLE = -504;
-	public static final int DISPID_BORDERWIDTH = -505;
+    public static final int DISPID_BORDERWIDTH = -505;
-	public static final int DISPID_DRAWMODE = -507;
+    public static final int DISPID_DRAWMODE = -507;
-	public static final int DISPID_DRAWSTYLE = -508;
+    public static final int DISPID_DRAWSTYLE = -508;
-	public static final int DISPID_DRAWWIDTH = -509;
+    public static final int DISPID_DRAWWIDTH = -509;
-	public static final int DISPID_FILLCOLOR = -510;
+    public static final int DISPID_FILLCOLOR = -510;
-	public static final int DISPID_FILLSTYLE = -511;
+    public static final int DISPID_FILLSTYLE = -511;
-	public static final int DISPID_FONT = -512;
+    public static final int DISPID_FONT = -512;
-	public static final int DISPID_FORECOLOR = -513;
+    public static final int DISPID_FORECOLOR = -513;
-	public static final int DISPID_ENABLED = -514;
+    public static final int DISPID_ENABLED = -514;
-	public static final int DISPID_HWND = -515;
+    public static final int DISPID_HWND = -515;
-	public static final int DISPID_TABSTOP = -516;
+    public static final int DISPID_TABSTOP = -516;
-	public static final int DISPID_TEXT = -517;
+    public static final int DISPID_TEXT = -517;
-	public static final int DISPID_CAPTION = -518;
+    public static final int DISPID_CAPTION = -518;
-	public static final int DISPID_BORDERVISIBLE = -519;
+    public static final int DISPID_BORDERVISIBLE = -519;
-	public static final int DISPID_APPEARANCE = -520;
+    public static final int DISPID_APPEARANCE = -520;
-	public static final int DISPID_MOUSEPOINTER = -521;
+    public static final int DISPID_MOUSEPOINTER = -521;
-	public static final int DISPID_MOUSEICON = -522;
+    public static final int DISPID_MOUSEICON = -522;
-	public static final int DISPID_PICTURE = -523;
+    public static final int DISPID_PICTURE = -523;
-	public static final int DISPID_VALID = -524;
+    public static final int DISPID_VALID = -524;
-	public static final int DISPID_READYSTATE = -525;
+    public static final int DISPID_READYSTATE = -525;
-	public static final int DISPID_REFRESH = -550;
+    public static final int DISPID_REFRESH = -550;
-	public static final int DISPID_DOCLICK = -551;
+    public static final int DISPID_DOCLICK = -551;
-	public static final int DISPID_ABOUTBOX = -552;
+    public static final int DISPID_ABOUTBOX = -552;
-	public static final int DISPID_CLICK = -600;
+    public static final int DISPID_CLICK = -600;
-	public static final int DISPID_DBLCLICK = -601;
+    public static final int DISPID_DBLCLICK = -601;
-	public static final int DISPID_KEYDOWN = -602;
+    public static final int DISPID_KEYDOWN = -602;
-	public static final int DISPID_KEYPRESS = -603;
+    public static final int DISPID_KEYPRESS = -603;
-	public static final int DISPID_KEYUP = -604;
+    public static final int DISPID_KEYUP = -604;
-	public static final int DISPID_MOUSEDOWN = -605;
+    public static final int DISPID_MOUSEDOWN = -605;
-	public static final int DISPID_MOUSEMOVE = -606;
+    public static final int DISPID_MOUSEMOVE = -606;
-	public static final int DISPID_MOUSEUP = -607;
+    public static final int DISPID_MOUSEUP = -607;
-	public static final int DISPID_ERROREVENT = -608;
+    public static final int DISPID_ERROREVENT = -608;
-	public static final int DISPID_READYSTATECHANGE = -609;
+    public static final int DISPID_READYSTATECHANGE = -609;
-	public static final int DISPID_AMBIENT_BACKCOLOR = -701;
+    public static final int DISPID_AMBIENT_BACKCOLOR = -701;
-	public static final int DISPID_AMBIENT_DISPLAYNAME = -702;
+    public static final int DISPID_AMBIENT_DISPLAYNAME = -702;
-	public static final int DISPID_AMBIENT_FONT = -703;
+    public static final int DISPID_AMBIENT_FONT = -703;
-	public static final int DISPID_AMBIENT_FORECOLOR = -704;
+    public static final int DISPID_AMBIENT_FORECOLOR = -704;
-	public static final int DISPID_AMBIENT_LOCALEID = -705;
+    public static final int DISPID_AMBIENT_LOCALEID = -705;
-	public static final int DISPID_AMBIENT_MESSAGEREFLECT = -706;
+    public static final int DISPID_AMBIENT_MESSAGEREFLECT = -706;
-	public static final int DISPID_AMBIENT_SCALEUNITS = -707;
+    public static final int DISPID_AMBIENT_SCALEUNITS = -707;
-	public static final int DISPID_AMBIENT_TEXTALIGN = -708;
+    public static final int DISPID_AMBIENT_TEXTALIGN = -708;
-	public static final int DISPID_AMBIENT_USERMODE = -709;
+    public static final int DISPID_AMBIENT_USERMODE = -709;
-	public static final int DISPID_AMBIENT_UIDEAD = -710;
+    public static final int DISPID_AMBIENT_UIDEAD = -710;
-	public static final int DISPID_AMBIENT_SHOWGRABHANDLES = -711;
+    public static final int DISPID_AMBIENT_SHOWGRABHANDLES = -711;
-	public static final int DISPID_AMBIENT_SHOWHATCHING = -712;
+    public static final int DISPID_AMBIENT_SHOWHATCHING = -712;
-	public static final int DISPID_AMBIENT_DISPLAYASDEFAULT = -713;
+    public static final int DISPID_AMBIENT_DISPLAYASDEFAULT = -713;
-	public static final int DISPID_AMBIENT_SUPPORTSMNEMONICS = -714;
+    public static final int DISPID_AMBIENT_SUPPORTSMNEMONICS = -714;
-	public static final int DISPID_AMBIENT_AUTOCLIP = -715;
+    public static final int DISPID_AMBIENT_AUTOCLIP = -715;
-	public static final int DISPID_AMBIENT_APPEARANCE = -716;
+    public static final int DISPID_AMBIENT_APPEARANCE = -716;
-	public static final int DISPID_AMBIENT_CODEPAGE = -725;
+    public static final int DISPID_AMBIENT_CODEPAGE = -725;
-	public static final int DISPID_AMBIENT_PALETTE = -726;
+    public static final int DISPID_AMBIENT_PALETTE = -726;
-	public static final int DISPID_AMBIENT_CHARSET = -727;
+    public static final int DISPID_AMBIENT_CHARSET = -727;
-	public static final int DISPID_AMBIENT_TRANSFERPRIORITY = -728;
+    public static final int DISPID_AMBIENT_TRANSFERPRIORITY = -728;
 }

src/main/java/com/jacob/com/DispatchProxy.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -29,66 +48,64 @@ package com.jacob.com;
  * construct a separate DispatchProxy instance for each such case!
  */
 public class DispatchProxy extends JacobObject {
-	/**
+    /**
-	 * Comment for <code>m_pStream</code>
+     * Comment for <code>m_pStream</code>
-	 */
+     */
-	public long m_pStream;
+    public int m_pStream;
 
-	/**
+    /**
-	 * Marshals the passed in dispatch into the stream
+     * Marshals the passed in dispatch into the stream
-	 * 
+     * 
-	 * @param localDispatch
+     * @param localDispatch
-	 */
+     */
-	public DispatchProxy(Dispatch localDispatch) {
+    public DispatchProxy(Dispatch localDispatch) {
-		MarshalIntoStream(localDispatch);
+        MarshalIntoStream(localDispatch);
-	}
+    }
 
-	/**
+    /**
-	 * 
+     * 
-	 * @return Dispatch the dispatch retrieved from the stream
+     * @return Dispatch the dispatch retrieved from the stream
-	 */
+     */
-	public Dispatch toDispatch() {
+    public Dispatch toDispatch() {
-		return MarshalFromStream();
+        return MarshalFromStream();
-	}
+    }
 
-	private native void MarshalIntoStream(Dispatch d);
+    private native void MarshalIntoStream(Dispatch d);
 
-	private native Dispatch MarshalFromStream();
+    private native Dispatch MarshalFromStream();
 
-	/**
+    /**
-	 * now private so only this object can access was: call this to explicitly
+     * now private so only this object can access was: call this to explicitly
-	 * release the com object before gc
+     * release the com object before gc
-	 * 
+     * 
-	 */
+     */
-	private native void release();
+    private native void release();
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see java.lang.Object#finalize()
+     * @see java.lang.Object#finalize()
-	 */
+     */
-	@Override
+    public void finalize() {
-	public void finalize() {
+        safeRelease();
-		safeRelease();
+    }
-	}
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see com.jacob.com.JacobObject#safeRelease()
+     * @see com.jacob.com.JacobObject#safeRelease()
-	 */
+     */
-	@Override
+    public void safeRelease() {
-	public void safeRelease() {
+        super.safeRelease();
-		super.safeRelease();
+        if (m_pStream != 0) {
-		if (m_pStream != 0) {
+            release();
-			release();
+            m_pStream = 0;
-			m_pStream = 0;
+        } else {
-		} else {
+            // looks like a double release
-			// looks like a double release
+            if (isDebugEnabled()) {
-			if (isDebugEnabled()) {
+                debug(this.getClass().getName() + ":" + this.hashCode()
-				debug(this.getClass().getName() + ":" + this.hashCode()
+                        + " double release");
-						+ " double release");
+            }
-			}
+        }
-		}
+    }
-	}
 }

src/main/java/com/jacob/com/EnumVariant.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -24,139 +43,133 @@ package com.jacob.com;
  * (mailto:Thomas.Hallgren@eoncompany.com)
  */
 public class EnumVariant extends JacobObject implements
-		java.util.Enumeration<Variant> {
+        java.util.Enumeration<Variant> {
-	/** pointer to windows memory */
+    private int m_pIEnumVARIANT;
-	private long m_pIEnumVARIANT;
 
-	private final Variant[] m_recBuf = new Variant[1];
+    private final Variant[] m_recBuf = new Variant[1];
 
-	// this only gets called from JNI
+    // this only gets called from JNI
-	//
+    //
-	protected EnumVariant(long pIEnumVARIANT) {
+    protected EnumVariant(int pIEnumVARIANT) {
-		m_pIEnumVARIANT = pIEnumVARIANT;
+        m_pIEnumVARIANT = pIEnumVARIANT;
-	}
+    }
 
-	/**
+    /**
-	 * @param disp
+     * @param disp
-	 */
+     */
-	public EnumVariant(Dispatch disp) {
+    public EnumVariant(Dispatch disp) {
-		int[] hres = new int[1];
+        int[] hres = new int[1];
-		// SF 3377279
+        Variant evv = Dispatch.invokev(disp, DispatchIdentifier.DISPID_NEWENUM,
-		// Added Dispatch.Method to the invoke flags to call _NewEnum. There are
+                Dispatch.Get, new Variant[0], hres);
-		// some
+        if (evv.getvt() != Variant.VariantObject)
-		// non-conforming legacy implementations that expose _NewEnum as a
+            //
-		// method.
+            // The DISPID_NEWENUM did not result in a valid object
-		Variant evv = Dispatch.invokev(disp, DispatchIdentifier.DISPID_NEWENUM,
+            //
-				Dispatch.Get | Dispatch.Method, new Variant[0], hres);
+            throw new ComFailException("Can't obtain EnumVARIANT");
-		if (evv.getvt() != Variant.VariantObject)
-			// The DISPID_NEWENUM did not result in a valid object
-			throw new ComFailException("Can't obtain EnumVARIANT");
 
-		EnumVariant tmp = evv.toEnumVariant();
+        EnumVariant tmp = evv.toEnumVariant();
-		m_pIEnumVARIANT = tmp.m_pIEnumVARIANT;
+        m_pIEnumVARIANT = tmp.m_pIEnumVARIANT;
-		tmp.m_pIEnumVARIANT = 0;
+        tmp.m_pIEnumVARIANT = 0;
-	}
+    }
 
-	/**
+    /**
-	 * Implements java.util.Enumeration
+     * Implements java.util.Enumeration
-	 * 
+     * 
-	 * @return boolean true if there are more elements in this enumeration
+     * @return boolean true if there are more elements in this enumeration
-	 */
+     */
-	public boolean hasMoreElements() {
+    public boolean hasMoreElements() {
-		{
+        {
-			if (m_recBuf[0] == null) {
+            if (m_recBuf[0] == null) {
-				if (this.Next(m_recBuf) <= 0)
+                if (this.Next(m_recBuf) <= 0)
-					return false;
+                    return false;
-			}
+            }
-			return true;
+            return true;
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Implements java.util.Enumeration
+     * Implements java.util.Enumeration
-	 * 
+     * 
-	 * @return next element in the enumeration
+     * @return next element in the enumeration
-	 */
+     */
-	public Variant nextElement() {
+    public Variant nextElement() {
-		Variant last = m_recBuf[0];
+        Variant last = m_recBuf[0];
-		if (last == null) {
+        if (last == null) {
-			if (this.Next(m_recBuf) <= 0)
+            if (this.Next(m_recBuf) <= 0)
-				throw new java.util.NoSuchElementException();
+                throw new java.util.NoSuchElementException();
-			last = m_recBuf[0];
+            last = m_recBuf[0];
-		}
+        }
-		m_recBuf[0] = null;
+        m_recBuf[0] = null;
-		return last;
+        return last;
-	}
+    }
 
-	/**
+    /**
-	 * Get next element in collection or null if at end
+     * Get next element in collection or null if at end
-	 * 
+     * 
-	 * @return Variant that is next in the collection
+     * @return Variant that is next in the collection
-	 * @deprecated use nextElement() instead
+     * @deprecated use nextElement() instead
-	 */
+     */
-	@Deprecated
+    @Deprecated
-	public Variant Next() {
+    public Variant Next() {
-		if (hasMoreElements())
+        if (hasMoreElements())
-			return nextElement();
+            return nextElement();
-		return null;
+        return null;
-	}
+    }
 
-	/**
+    /**
-	 * This should be private and wrapped to protect JNI layer.
+     * This should be private and wrapped to protect JNI layer.
-	 * 
+     * 
-	 * @param receiverArray
+     * @param receiverArray
-	 * @return Returns the next variant object pointer as an int from windows
+     * @return Returns the next variant object pointer as an int from windows
-	 *         layer
+     *         layer
-	 */
+     */
-	public native int Next(Variant[] receiverArray);
+    public native int Next(Variant[] receiverArray);
 
-	/**
+    /**
-	 * This should be private and wrapped to protect JNI layer.
+     * This should be private and wrapped to protect JNI layer.
-	 * 
+     * 
-	 * @param count
+     * @param count
-	 *            number to skip
+     *            number to skip
-	 */
+     */
-	public native void Skip(int count);
+    public native void Skip(int count);
 
-	/**
+    /**
-	 * This should be private and wrapped to protect JNI layer
+     * This should be private and wrapped to protect JNI layer
-	 */
+     */
-	public native void Reset();
+    public native void Reset();
 
-	/**
+    /**
-	 * now private so only this object can access was: call this to explicitly
+     * now private so only this object can access was: call this to explicitly
-	 * release the com object before gc
+     * release the com object before gc
-	 * 
+     * 
-	 */
+     */
-	private native void release();
+    private native void release();
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see java.lang.Object#finalize()
+     * @see java.lang.Object#finalize()
-	 */
+     */
-	@Override
+    protected void finalize() {
-	protected void finalize() {
+        safeRelease();
-		safeRelease();
+    }
-	}
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see com.jacob.com.JacobObject#safeRelease()
+     * @see com.jacob.com.JacobObject#safeRelease()
-	 */
+     */
-	@Override
+    public void safeRelease() {
-	public void safeRelease() {
+        super.safeRelease();
-		super.safeRelease();
+        if (m_pIEnumVARIANT != 0) {
-		if (m_pIEnumVARIANT != 0) {
+            this.release();
-			this.release();
+            m_pIEnumVARIANT = 0;
-			m_pIEnumVARIANT = 0;
+        } else {
-		} else {
+            // looks like a double release
-			// looks like a double release
+            if (isDebugEnabled()) {
-			if (isDebugEnabled()) {
+                debug(this.getClass().getName() + ":" + this.hashCode()
-				debug(this.getClass().getName() + ":" + this.hashCode()
+                        + " double release");
-						+ " double release");
+            }
-			}
+        }
-		}
+    }
-	}
 }

src/main/java/com/jacob/com/InvocationProxy.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -39,70 +58,70 @@ package com.jacob.com;
  */
 public abstract class InvocationProxy {
 
-	/**
+    /**
-	 * the object we will try and forward to.
+     * the object we will try and forward to.
-	 */
+     */
-	protected Object mTargetObject = null;
+    protected Object mTargetObject = null;
 
-	/**
+    /**
-	 * dummy constructor for subclasses that don't actually wrap anything and
+     * dummy constructor for subclasses that don't actually wrap anything and
-	 * just want to override the invoke() method
+     * just want to override the invoke() method
-	 */
+     */
-	protected InvocationProxy() {
+    protected InvocationProxy() {
-		super();
+        super();
-	}
+    }
 
-	/**
+    /**
-	 * The method actually invoked by EventProxy.cpp. The method name is
+     * The method actually invoked by EventProxy.cpp. The method name is
-	 * calculated by the underlying JNI code from the MS windows Callback
+     * calculated by the underlying JNI code from the MS windows Callback
-	 * function name. The method is assumed to take an array of Variant objects.
+     * function name. The method is assumed to take an array of Variant objects.
-	 * The method may return a Variant or be a void. Those are the only two
+     * The method may return a Variant or be a void. Those are the only two
-	 * options that will not blow up.
+     * options that will not blow up.
-	 * <p>
+     * <p>
-	 * Subclasses that override this should make sure mTargetObject is not null
+     * Subclasses that override this should make sure mTargetObject is not null
-	 * before processing.
+     * before processing.
-	 * 
+     * 
-	 * @param methodName
+     * @param methodName
-	 *            name of method in mTargetObject we will invoke
+     *            name of method in mTargetObject we will invoke
-	 * @param targetParameters
+     * @param targetParameters
-	 *            Variant[] that is the single parameter to the method
+     *            Variant[] that is the single parameter to the method
-	 * @return an object that will be returned to the com event caller
+     * @return an object that will be returned to the com event caller
-	 */
+     */
-	public abstract Variant invoke(String methodName,
+    public abstract Variant invoke(String methodName,
-			Variant targetParameters[]);
+            Variant targetParameters[]);
 
-	/**
+    /**
-	 * used by EventProxy.cpp to create variant objects in the right thread
+     * used by EventProxy.cpp to create variant objects in the right thread
-	 * 
+     * 
-	 * @return Variant object that will be used by the COM layer
+     * @return Variant object that will be used by the COM layer
-	 */
+     */
-	public Variant getVariant() {
+    public Variant getVariant() {
-		return new VariantViaEvent();
+        return new VariantViaEvent();
-	}
+    }
 
-	/**
+    /**
-	 * Sets the target for this InvocationProxy.
+     * Sets the target for this InvocationProxy.
-	 * 
+     * 
-	 * @param pTargetObject
+     * @param pTargetObject
-	 * @throws IllegalArgumentException
+     * @throws IllegalArgumentException
-	 *             if target is not publicly accessible
+     *             if target is not publicly accessible
-	 */
+     */
-	public void setTarget(Object pTargetObject) {
+    public void setTarget(Object pTargetObject) {
-		if (JacobObject.isDebugEnabled()) {
+        if (JacobObject.isDebugEnabled()) {
-			JacobObject.debug("InvocationProxy: setting target "
+            JacobObject.debug("InvocationProxy: setting target "
-					+ pTargetObject);
+                    + pTargetObject);
-		}
+        }
-		if (pTargetObject != null) {
+        if (pTargetObject != null) {
-			// JNI code apparently bypasses this check and could operate against
+            // JNI code apparently bypasses this check and could operate against
-			// protected classes. This seems like a security issue...
+            // protected classes. This seems like a security issue...
-			// maybe it was because JNI code isn't in a package?
+            // maybe it was because JNI code isn't in a package?
-			if (!java.lang.reflect.Modifier.isPublic(pTargetObject.getClass()
+            if (!java.lang.reflect.Modifier.isPublic(pTargetObject.getClass()
-					.getModifiers())) {
+                    .getModifiers())) {
-				throw new IllegalArgumentException(
+                throw new IllegalArgumentException(
-						"InvocationProxy only public classes can receive event notifications");
+                        "InvocationProxy only public classes can receive event notifications");
-			}
+            }
-		}
+        }
-		mTargetObject = pTargetObject;
+        mTargetObject = pTargetObject;
-	}
+    }
 
 }

src/main/java/com/jacob/com/InvocationProxyAllVariants.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -36,88 +55,88 @@ import java.lang.reflect.Method;
  */
 public class InvocationProxyAllVariants extends InvocationProxy {
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see com.jacob.com.InvocationProxy#invoke(java.lang.String,
+     * @see com.jacob.com.InvocationProxy#invoke(java.lang.String,
-	 *      com.jacob.com.Variant[])
+     *      com.jacob.com.Variant[])
-	 */
+     */
-	@SuppressWarnings("unchecked")
+    @SuppressWarnings("unchecked")
-	public Variant invoke(String methodName, Variant targetParameters[]) {
+    public Variant invoke(String methodName, Variant targetParameters[]) {
-		Variant mVariantToBeReturned = null;
+        Variant mVariantToBeReturned = null;
-		if (mTargetObject == null) {
+        if (mTargetObject == null) {
-			if (JacobObject.isDebugEnabled()) {
+            if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("InvocationProxy: received notification ("
+                JacobObject.debug("InvocationProxy: received notification ("
-						+ methodName + ") with no target set");
+                        + methodName + ") with no target set");
-			}
+            }
-			// structured programming guidlines say this return should not be up
+            // structured programming guidlines say this return should not be up
-			// here
+            // here
-			return null;
+            return null;
-		}
+        }
-		Class targetClass = mTargetObject.getClass();
+        Class targetClass = mTargetObject.getClass();
-		if (methodName == null) {
+        if (methodName == null) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"InvocationProxy: missing method name");
+                    "InvocationProxy: missing method name");
-		}
+        }
-		if (targetParameters == null) {
+        if (targetParameters == null) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"InvocationProxy: missing Variant parameters");
+                    "InvocationProxy: missing Variant parameters");
-		}
+        }
-		try {
+        try {
-			if (JacobObject.isDebugEnabled()) {
+            if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("InvocationProxy: trying to invoke "
+                JacobObject.debug("InvocationProxy: trying to invoke "
-						+ methodName + " on " + mTargetObject);
+                        + methodName + " on " + mTargetObject);
-			}
+            }
-			Method targetMethod;
+            Method targetMethod;
-			targetMethod = targetClass.getMethod(methodName,
+            targetMethod = targetClass.getMethod(methodName,
-					new Class[] { Variant[].class });
+                    new Class[] { Variant[].class });
-			if (targetMethod != null) {
+            if (targetMethod != null) {
-				// protected classes can't be invoked against even if they
+                // protected classes can't be invoked against even if they
-				// let you grab the method. you could do
+                // let you grab the method. you could do
-				// targetMethod.setAccessible(true);
+                // targetMethod.setAccessible(true);
-				// but that should be stopped by the security manager
+                // but that should be stopped by the security manager
-				Object mReturnedByInvocation = null;
+                Object mReturnedByInvocation = null;
-				mReturnedByInvocation = targetMethod.invoke(mTargetObject,
+                mReturnedByInvocation = targetMethod.invoke(mTargetObject,
-						new Object[] { targetParameters });
+                        new Object[] { targetParameters });
-				if (mReturnedByInvocation == null) {
+                if (mReturnedByInvocation == null) {
-					mVariantToBeReturned = null;
+                    mVariantToBeReturned = null;
-				} else if (!(mReturnedByInvocation instanceof Variant)) {
+                } else if (!(mReturnedByInvocation instanceof Variant)) {
-					// could try and convert to Variant here.
+                    // could try and convert to Variant here.
-					throw new IllegalArgumentException(
+                    throw new IllegalArgumentException(
-							"InvocationProxy: invokation of target method returned "
+                            "InvocationProxy: invokation of target method returned "
-									+ "non-null non-variant object: "
+                                    + "non-null non-variant object: "
-									+ mReturnedByInvocation);
+                                    + mReturnedByInvocation);
-				} else {
+                } else {
-					mVariantToBeReturned = (Variant) mReturnedByInvocation;
+                    mVariantToBeReturned = (Variant) mReturnedByInvocation;
-				}
+                }
-			}
+            }
-		} catch (SecurityException e) {
+        } catch (SecurityException e) {
-			// what causes this exception?
+            // what causes this exception?
-			e.printStackTrace();
+            e.printStackTrace();
-		} catch (NoSuchMethodException e) {
+        } catch (NoSuchMethodException e) {
-			// this happens whenever the listener doesn't implement all the
+            // this happens whenever the listener doesn't implement all the
-			// methods
+            // methods
-			if (JacobObject.isDebugEnabled()) {
+            if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("InvocationProxy: listener (" + mTargetObject
+                JacobObject.debug("InvocationProxy: listener (" + mTargetObject
-						+ ") doesn't implement " + methodName);
+                        + ") doesn't implement " + methodName);
-			}
+            }
-		} catch (IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
-			e.printStackTrace();
+            e.printStackTrace();
-			// we can throw these inside the catch block so need to re-throw it
+            // we can throw these inside the catch block so need to re-throw it
-			throw e;
+            throw e;
-		} catch (IllegalAccessException e) {
+        } catch (IllegalAccessException e) {
-			// can't access the method on the target instance for some reason
+            // can't access the method on the target instance for some reason
-			if (JacobObject.isDebugEnabled()) {
+            if (JacobObject.isDebugEnabled()) {
-				JacobObject
+                JacobObject
-						.debug("InvocationProxy: probably tried to access public method on non public class"
+                        .debug("InvocationProxy: probably tried to access public method on non public class"
-								+ methodName);
+                                + methodName);
-			}
+            }
-			e.printStackTrace();
+            e.printStackTrace();
-		} catch (InvocationTargetException e) {
+        } catch (InvocationTargetException e) {
-			// invocation of target method failed
+            // invocation of target method failed
-			e.printStackTrace();
+            e.printStackTrace();
-		}
+        }
-		return mVariantToBeReturned;
+        return mVariantToBeReturned;
 
-	}
+    }
 }

src/main/java/com/jacob/com/JacobException.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -26,24 +45,24 @@ package com.jacob.com;
  */
 public class JacobException extends RuntimeException {
 
-	/**
+    /**
-	 * 
+     * 
-	 */
+     */
-	private static final long serialVersionUID = -1637125318746002715L;
+    private static final long serialVersionUID = -1637125318746002715L;
 
-	/**
+    /**
-	 * Default constructor. Calls super with a "No Message Provided" string
+     * Default constructor. Calls super with a "No Message Provided" string
-	 */
+     */
-	public JacobException() {
+    public JacobException() {
-		super("No Message Provided");
+        super("No Message Provided");
-	}
+    }
 
-	/**
+    /**
-	 * standard constructor
+     * standard constructor
-	 * 
+     * 
-	 * @param message
+     * @param message
-	 */
+     */
-	public JacobException(String message) {
+    public JacobException(String message) {
-		super(message);
+        super(message);
-	}
+    }
 }

src/main/java/com/jacob/com/JacobObject.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -34,77 +53,78 @@ package com.jacob.com;
  */
 public class JacobObject {
 
-	/**
+    /**
-	 * Standard constructor that adds this JacobObject to the memory management
+     * Standard constructor that adds this JacobObject to the memory management
-	 * pool.
+     * pool.
-	 */
+     */
-	public JacobObject() {
+    public JacobObject() {
-		ROT.addObject(this);
+        ROT.addObject(this);
-	}
+    }
 
-	/**
+    /**
-	 * Finalizers call this method. This method should release any COM data
+     * Finalizers call this method. This method should release any COM data
-	 * structures in a way that it can be called multiple times. This can happen
+     * structures in a way that it can be called multiple times. This can happen
-	 * if someone manually calls this and then a finalizer calls it.
+     * if someone manually calls this and then a finalizer calls it.
-	 */
+     */
-	public void safeRelease() {
+    public void safeRelease() {
-		// currently does nothing - subclasses may do something
+        // currently does nothing - subclasses may do something
-		if (isDebugEnabled()) {
+        if (isDebugEnabled()) {
-			// this used to do a toString() but that is bad for SafeArray
+            // this used to do a toString() but that is bad for SafeArray
-			debug("SafeRelease: " + this.getClass().getName());
+            debug("SafeRelease: " + this.getClass().getName());
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * When things go wrong, it is useful to be able to debug the ROT.
+     * When things go wrong, it is useful to be able to debug the ROT.
-	 */
+     */
-	private static final boolean DEBUG =
+    private static final boolean DEBUG =
-	// true;
+    // true;
-	"true".equalsIgnoreCase(System.getProperty("com.jacob.debug"));
+    "true".equalsIgnoreCase(System.getProperty("com.jacob.debug"));
 
-	protected static boolean isDebugEnabled() {
+    protected static boolean isDebugEnabled() {
-		return DEBUG;
+        // return true;
-	}
+        return DEBUG;
+    }
 
-	/**
+    /**
-	 * Loads JacobVersion.Properties and returns the value of version in it
+     * Loads JacobVersion.Properties and returns the value of version in it
-	 * 
+     * 
-	 * @deprecated use JacobReleaseInfo.getBuildDate() instead.
+     * @deprecated use JacobReleaseInfo.getBuildDate() instead.
-	 * @return String value of version in JacobVersion.Properties or "" if none
+     * @return String value of version in JacobVersion.Properties or "" if none
-	 */
+     */
-	@Deprecated
+    @Deprecated
-	public static String getBuildDate() {
+    public static String getBuildDate() {
-		return JacobReleaseInfo.getBuildDate();
+        return JacobReleaseInfo.getBuildDate();
-	}
+    }
 
-	/**
+    /**
-	 * Loads JacobVersion.Properties and returns the value of version in it
+     * Loads JacobVersion.Properties and returns the value of version in it
-	 * 
+     * 
-	 * @deprecated use JacobReleaseInfo.getBuildVersion() instead.
+     * @deprecated use JacobReleaseInfo.getBuildVersion() instead.
-	 * @return String value of version in JacobVersion.Properties or "" if none
+     * @return String value of version in JacobVersion.Properties or "" if none
-	 */
+     */
-	@Deprecated
+    @Deprecated
-	public static String getBuildVersion() {
+    public static String getBuildVersion() {
-		return JacobReleaseInfo.getBuildVersion();
+        return JacobReleaseInfo.getBuildVersion();
-	}
+    }
 
-	/**
+    /**
-	 * Very basic debugging function.
+     * Very basic debugging function.
-	 * 
+     * 
-	 * @param istrMessage
+     * @param istrMessage
-	 */
+     */
-	protected static void debug(String istrMessage) {
+    protected static void debug(String istrMessage) {
-		if (isDebugEnabled()) {
+        if (isDebugEnabled()) {
-			System.out.println(Thread.currentThread().getName() + ": "
+            System.out.println(Thread.currentThread().getName() + ": "
-					+ istrMessage);
+                    + istrMessage);
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * force the jacob DLL to be loaded whenever this class is referenced
+     * force the jacob DLL to be loaded whenever this class is referenced
-	 */
+     */
-	static {
+    static {
-		LibraryLoader.loadJacobLibrary();
+        LibraryLoader.loadJacobLibrary();
-	}
+    }
 
 }

src/main/java/com/jacob/com/JacobReleaseInfo.java

@@ -1,3 +1,41 @@
+/**
+ * This file is part of jlibcom.
+ *
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
+ *
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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 jlibcom. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 package com.jacob.com;
 
 import java.io.IOException;
@@ -11,86 +49,86 @@ import java.util.Properties;
  */
 public class JacobReleaseInfo {
 
-	/**
+    /**
-	 * holds the build version as retrieved from the version properties file
+     * holds the build version as retrieved from the version properties file
-	 * that exists in the JAR. This can be retrieved by calling the static
+     * that exists in the JAR. This can be retrieved by calling the static
-	 * method getBuildVersion()
+     * method getBuildVersion()
-	 * 
+     * 
-	 * @see #getBuildVersion()
+     * @see #getBuildVersion()
-	 */
+     */
-	private static String buildVersion = "";
+    private static String buildVersion = "";
-	/**
+    /**
-	 * holds the build date as retrieved from the version properties file that
+     * holds the build date as retrieved from the version properties file that
-	 * exists in the JAR This can be retrieved by calling the static method
+     * exists in the JAR This can be retrieved by calling the static method
-	 * getBuildDate()
+     * getBuildDate()
-	 * 
+     * 
-	 * @see #getBuildDate()
+     * @see #getBuildDate()
-	 */
+     */
-	private static String buildDate = "";
+    private static String buildDate = "";
-	/** the name of the jacob version properties file */
+    /** the name of the jacob version properties file */
-	private static final String PROPERTY_FILE_NAME = "META-INF/JacobVersion.properties";
+    private static final String PROPERTY_FILE_NAME = "META-INF/JacobVersion.properties";
 
-	/**
+    /**
-	 * Loads version information from PROPERTY_FILE_NAME that was built as part
+     * Loads version information from PROPERTY_FILE_NAME that was built as part
-	 * of this release.
+     * of this release.
-	 * 
+     * 
-	 * @throws IllegalStateException
+     * @throws IllegalStateException
-	 *             when it can't find the version properties file
+     *             when it can't find the version properties file
-	 */
+     */
-	private static void loadVersionProperties() {
+    private static void loadVersionProperties() {
-		Properties versionProps = new Properties();
+        Properties versionProps = new Properties();
-		// can't use system class loader cause won't work in JavaWebStart
+        // can't use system class loader cause won't work in JavaWebStart
-		InputStream stream = JacobReleaseInfo.class.getClassLoader()
+        InputStream stream = JacobReleaseInfo.class.getClassLoader()
-				.getResourceAsStream(PROPERTY_FILE_NAME);
+                .getResourceAsStream(PROPERTY_FILE_NAME);
-		// This should never happen. This is an attempt to make something work
+        // This should never happen. This is an attempt to make something work
-		// for WebSphere. They may be using some kind of Servlet loader that
+        // for WebSphere. They may be using some kind of Servlet loader that
-		// needs an absolute path based search
+        // needs an absolute path based search
-		if (stream == null) {
+        if (stream == null) {
-			stream = JacobReleaseInfo.class.getClassLoader()
+            stream = JacobReleaseInfo.class.getClassLoader()
-					.getResourceAsStream("/" + PROPERTY_FILE_NAME);
+                    .getResourceAsStream("/" + PROPERTY_FILE_NAME);
-		}
+        }
-		// A report came in that WebSphere had trouble finding the file
+        // A report came in that WebSphere had trouble finding the file
-		// so lets trap it. Plus, it's a good idea anyway.
+        // so lets trap it. Plus, it's a good idea anyway.
-		if (stream == null) {
+        if (stream == null) {
-			throw new IllegalStateException(
+            throw new IllegalStateException(
-					"Can't find "
+                    "Can't find "
-							+ PROPERTY_FILE_NAME
+                            + PROPERTY_FILE_NAME
-							+ " using JacobReleaseInfo.class.getClassLoader().getResourceAsStream()");
+                            + " using JacobReleaseInfo.class.getClassLoader().getResourceAsStream()");
-		} else {
+        } else {
-			try {
+            try {
-				versionProps.load(stream);
+                versionProps.load(stream);
-				stream.close();
+                stream.close();
-				buildVersion = (String) versionProps.get("version");
+                buildVersion = (String) versionProps.get("version");
-				buildDate = (String) versionProps.get("build.date");
+                buildDate = (String) versionProps.get("build.date");
-			} catch (IOException ioe) {
+            } catch (IOException ioe) {
-				ioe.printStackTrace();
+                ioe.printStackTrace();
-				System.err.println("Warning! Couldn't load props " + ioe);
+                System.err.println("Warning! Couldn't load props " + ioe);
-			}
+            }
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * loads PROPERT_FILE_NAME and returns the value of version in it
+     * loads PROPERT_FILE_NAME and returns the value of version in it
-	 * 
+     * 
-	 * @return String value of version in PROPERT_FILE_NAME or "" if none
+     * @return String value of version in PROPERT_FILE_NAME or "" if none
-	 */
+     */
-	public static String getBuildDate() {
+    public static String getBuildDate() {
-		if (buildDate.equals("")) {
+        if (buildDate.equals("")) {
-			loadVersionProperties();
+            loadVersionProperties();
-		}
+        }
-		return buildDate;
+        return buildDate;
-	}
+    }
 
-	/**
+    /**
-	 * loads PROPERT_FILE_NAME and returns the value of version in it
+     * loads PROPERT_FILE_NAME and returns the value of version in it
-	 * 
+     * 
-	 * @return String value of version in PROPERT_FILE_NAME or "" if none
+     * @return String value of version in PROPERT_FILE_NAME or "" if none
-	 */
+     */
-	public static String getBuildVersion() {
+    public static String getBuildVersion() {
-		if (buildVersion.equals("")) {
+        if (buildVersion.equals("")) {
-			loadVersionProperties();
+            loadVersionProperties();
-		}
+        }
-		return buildVersion;
+        return buildVersion;
-	}
+    }
 
 }

src/main/java/com/jacob/com/LibraryLoader.java

@@ -1,230 +1,59 @@
-/*
+/**
- * Copyright (c) 1999-2007 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
-import java.util.Enumeration;
+import com.github.boukefalos.jlibloader.Native;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Set;
 
 /**
  * Utility class to centralize the way in which the jacob JNI library is loaded.
- * <p>
- * 
- * This supports defining the path or library name using system properties or a
- * custom resource file. If desired, jacob can auto-detect the correct version
- * of the DLL for 32 or 64 bit windows, as long as you have named them
- * differently.
- * 
- * <ol>
- * <li> If system property {@link #JACOB_DLL_PATH} is defined, the file located
- * there will be loaded as the jacob dll using System.load(). </li>
- * 
- * <li> If system property {@link #JACOB_DLL_NAME} is defined, the file located
- * there will be loaded as the jacob dll. </li>
- * <li> If system property {@link #JACOB_DLL_NAME_X86} and
- * {@link #JACOB_DLL_NAME_X64} are defined, the file located there will be
- * loaded as the jacob dll, depending on the version of Windows. </li>
- * 
- * <li> If {@link #JACOB_DLL_NAME} is defined in the
- * {@code com.jacob.com.JacobLibraryLoader} resource file, the specified dll
- * will be loaded from the {@code java.library.path}. </li>
- * <li> If {@link #JACOB_DLL_NAME_X86} and {@link #JACOB_DLL_NAME_X64} are
- * defined in the {@code com.jacob.com.JacobLibraryLoader} resource file, the
- * specified dll will be loaded from the {@code java.library.path}, depending
- * on the version of Windows. </li>
- * 
- * <li> If none of the above are true, the default is to load the library named
- * "jacob-&lt;version&gt;-&lt;arch&gt" (or
- * "jacob-&lt;version&gt;-&lt;arch&rt;.dll") from the {@code java.library.path}.
- * </li>
- * </ol>
- * 
- * The standard behavior for most applications is that {@code LoadLibrary()}
- * will be called to load the dll. {@code LoadLibary()} searches directories
- * specified in the variable {@code java.library.path}. This is why most test
- * cases specify -Djava.library.path in their command line arguments.
- * <p>
- * JACOB_DLL_PATH submitted sourceforge ticket 1493647 Added 1.11 <br>
- * JACOB_DLL_NAME, JACOB_DLL_NAME_32, JACOB_DLL_NAME_64 submitted sourceforge
- * ticket 1845039 Added 1.14M7
  * 
  * @author Scott Dickerson (sjd78)
  * @author Jason Smith
  */
 public final class LibraryLoader {
-	/**
+    /**
-	 * Name of system property (currently <tt>jacob.dll.path</tt>) that may
+     * Load the jacob dll
-	 * contain an absolute path to the JNI library.
+     * 
-	 */
+     * @throws UnsatisfiedLinkError
-	public static final String JACOB_DLL_PATH = "jacob.dll.path";
+     *             if the library does not exist.
-
+     */
-	/**
+    public static void loadJacobLibrary() {
-	 * Name of system property (currently <tt>jacob.dll.name</tt>) that may
+        Native.load("com.github.boukefalos", "jlibcom");
-	 * contain an alternate name for the JNI library (default is 'jacob').
+    }
-	 */
+}
-	public static final String JACOB_DLL_NAME = "jacob.dll.name";
-
-	/**
-	 * Name of system property (currently <tt>jacob.dll.name</tt>) that may
-	 * contain an alternate name for the JNI library (default is 'jacob'), 32
-	 * bit windows.
-	 */
-	public static final String JACOB_DLL_NAME_X86 = "jacob.dll.name.x86";
-
-	/**
-	 * Name of system property (currently <tt>jacob.dll.name</tt>) that may
-	 * contain an alternate name for the JNI library (default is 'jacob'), 64
-	 * bit windows.
-	 */
-	public static final String JACOB_DLL_NAME_X64 = "jacob.dll.name.x64";
-
-	/**
-	 * Appended to "jacob" when building DLL name This string must EXACTLY match
-	 * the string in the build.xml file
-	 */
-	public static final String DLL_NAME_MODIFIER_32_BIT = "x86";
-	/**
-	 * Appended to "jacob" when building DLL name This string must EXACTLY match
-	 * the string in the build.xml file
-	 */
-	public static final String DLL_NAME_MODIFIER_64_BIT = "x64";
-
-	/**
-	 * Load the jacob dll either from an absolute path or by a library name,
-	 * both of which may be defined in various ways.
-	 * 
-	 * @throws UnsatisfiedLinkError
-	 *             if the library does not exist.
-	 */
-	public static void loadJacobLibrary() {
-		// In some cases, a library that uses Jacob won't be able to set system
-		// properties
-		// prior to Jacob being loaded. The resource bundle provides an
-		// alternate way to
-		// override DLL name or path that will be loaded with Jacob regardless
-		// of other
-		// initialization order.
-		ResourceBundle resources = null;
-		Set<String> keys = new HashSet<String>();
-		try {
-			resources = ResourceBundle.getBundle(LibraryLoader.class.getName(),
-					Locale.getDefault(), LibraryLoader.class.getClassLoader());
-			for (Enumeration<String> i = resources.getKeys(); i
-					.hasMoreElements();) {
-				String key = i.nextElement();
-				keys.add(key);
-			}
-		} catch (MissingResourceException e) {
-			// Do nothing. Expected.
-		}
-
-		// First, check for a defined PATH. System property overrides resource
-		// bundle.
-		String path = System.getProperty(JACOB_DLL_PATH);
-		if (path == null && resources != null && keys.contains(JACOB_DLL_PATH)) {
-			path = (String) resources.getObject(JACOB_DLL_PATH);
-		}
-
-		if (path != null) {
-			JacobObject.debug("Loading library " + path
-					+ " using System.loadLibrary ");
-			System.load(path);
-		} else {
-			// Path was not defined, so use the OS mechanism for loading
-			// libraries.
-			// Check for a defined NAME. System property overrides resource
-			// bundle.
-			String name = null;
-
-			if (System.getProperty(JACOB_DLL_NAME) != null) {
-				name = System.getProperty(JACOB_DLL_NAME);
-			} else if (System.getProperty(JACOB_DLL_NAME_X86) != null
-					&& shouldLoad32Bit()) {
-				name = System.getProperty(JACOB_DLL_NAME_X86);
-			} else if (System.getProperty(JACOB_DLL_NAME_X64) != null
-					&& !shouldLoad32Bit()) {
-				name = System.getProperty(JACOB_DLL_NAME_X64);
-			} else if (resources != null && keys.contains(JACOB_DLL_NAME)) {
-				name = resources.getString(JACOB_DLL_NAME);
-			} else if (resources != null && keys.contains(JACOB_DLL_NAME_X86)
-					&& shouldLoad32Bit()) {
-				name = resources.getString(JACOB_DLL_NAME_X86);
-			} else if (resources != null && keys.contains(JACOB_DLL_NAME_X64)
-					&& !shouldLoad32Bit()) {
-				name = resources.getString(JACOB_DLL_NAME_X64);
-			} else {
-				// No alternate NAME or PATH was defined, so use the default.
-				// We will almost always end up here.
-				name = getPreferredDLLName();
-			}
-
-			JacobObject.debug("Loading library " + name
-					+ " using System.loadLibrary ");
-			// System.out.println("Loading " + name);
-			System.loadLibrary(name);
-		}
-	}
-
-	/**
-	 * Developer note: This method MUST be synchronized with the DLL names
-	 * created as part of the build process in build.xml
-	 * <p>
-	 * The DLL name is "jacob\<PLATFORM\>.release"
-	 * 
-	 * @return the preferred name of the DLL adjusted for this platform and
-	 *         version without the ".dll" extension
-	 */
-	public static String getPreferredDLLName() {
-		if (shouldLoad32Bit()) {
-			return "jacob" + "-" + JacobReleaseInfo.getBuildVersion() + "-"
-					+ DLL_NAME_MODIFIER_32_BIT;
-		} else {
-			return "jacob" + "-" + JacobReleaseInfo.getBuildVersion() + "-"
-					+ DLL_NAME_MODIFIER_64_BIT;
-		}
-	}
-
-	/**
-	 * Detects whether this is a 32-bit JVM.
-	 * 
-	 * @return {@code true} if this is a 32-bit JVM.
-	 */
-	protected static boolean shouldLoad32Bit() {
-		// This guesses whether we are running 32 or 64 bit Java.
-		// This works for Sun and IBM JVMs version 5.0 or later.
-		// May need to be adjusted for non-Sun JVMs.
-
-		String bits = System.getProperty("sun.arch.data.model", "?");
-		if (bits.equals("32"))
-			return true;
-		else if (bits.equals("64"))
-			return false;
-
-		// this works for jRocket
-		String arch = System.getProperty("java.vm.name", "?");
-		if (arch.toLowerCase().indexOf("64-bit") >= 0)
-			return false;
-
-		return true;
-	}
-} // LibraryLoader

src/main/java/com/jacob/com/MainSTA.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 

src/main/java/com/jacob/com/NotImplementedException.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -26,16 +45,16 @@ package com.jacob.com;
  */
 public class NotImplementedException extends JacobException {
 
-	/**
+    /**
-	 * 
+     * 
-	 */
+     */
-	private static final long serialVersionUID = -9169900832852356445L;
+    private static final long serialVersionUID = -9169900832852356445L;
 
-	/**
+    /**
-	 * @param description
+     * @param description
-	 */
+     */
-	public NotImplementedException(String description) {
+    public NotImplementedException(String description) {
-		super(description);
+        super(description);
-	}
+    }
 
 }

src/main/java/com/jacob/com/ROT.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -41,226 +60,239 @@ import java.util.WeakHashMap;
  * Is [ 1116101 ] jacob-msg 0284 relevant???
  */
 public abstract class ROT {
-	/**
+    /**
-	 * Manual garbage collection was the only option pre 1.9 Can staticly cache
+     * Manual garbage collection was the only option pre 1.9 Can staticly cache
-	 * the results because only one value and we don't let it change during a
+     * the results because only one value and we don't let it change during a
-	 * run
+     * run
-	 */
+     */
-	protected static final boolean USE_AUTOMATIC_GARBAGE_COLLECTION = "true"
+    protected static final boolean USE_AUTOMATIC_GARBAGE_COLLECTION = "true"
-			.equalsIgnoreCase(System.getProperty("com.jacob.autogc"));
+            .equalsIgnoreCase(System.getProperty("com.jacob.autogc"));
 
-	/**
+    /**
-	 * If the code is ran from an applet that is called from javascript the Java
+     * If the code is ran from an applet that is called from javascript the Java
-	 * Plugin does not give full permissions to the code and thus System
+     * Plugin does not give full permissions to the code and thus System
-	 * properties cannot be accessed. They can be accessed at class
+     * properties cannot be accessed. They can be accessed at class
-	 * initialization time.
+     * initialization time.
-	 * 
+     * 
-	 * The default behavior is to include all classes in the ROT, setting a
+     * The default behavior is to include all classes in the ROT, setting a
-	 * boolean here to indicate this prevents a call to System.getProperty as
+     * boolean here to indicate this prevents a call to System.getProperty as
-	 * part of the general call flow.
+     * part of the general call flow.
-	 */
+     */
-	protected static final Boolean INCLUDE_ALL_CLASSES_IN_ROT = Boolean
+    protected static final Boolean INCLUDE_ALL_CLASSES_IN_ROT = Boolean
-			.valueOf(System.getProperty("com.jacob.includeAllClassesInROT",
+            .valueOf(System.getProperty("com.jacob.includeAllClassesInROT",
-					"true"));
+                    "true"));
 
-	/**
+    /**
-	 * Suffix added to class name to make up property name that determines if
+     * Suffix added to class name to make up property name that determines if
-	 * this object should be stored in the ROT. This 1.13 "feature" makes it
+     * this object should be stored in the ROT. This 1.13 "feature" makes it
-	 * possible to cause VariantViaEvent objects to not be added to the ROT in
+     * possible to cause VariantViaEvent objects to not be added to the ROT in
-	 * event callbacks.
+     * event callbacks.
-	 * <p>
+     * <p>
-	 * We don't have a static for the actual property because there is a
+     * We don't have a static for the actual property because there is a
-	 * different property for each class that may make use of this feature.
+     * different property for each class that may make use of this feature.
-	 */
+     */
-	protected static String PUT_IN_ROT_SUFFIX = ".PutInROT";
+    protected static String PUT_IN_ROT_SUFFIX = ".PutInROT";
 
-	/**
+    /**
-	 * ThreadLocal with the com objects created in that thread
+     * A hash table where each element is another HashMap that represents a
-	 */
+     * thread. Each thread HashMap contains the com objects created in that
-	private static ThreadLocal<Map<JacobObject, String>> rot = new ThreadLocal<Map<JacobObject, String>>();
+     * thread
+     */
+    private static HashMap<String, Map<JacobObject, String>> rot = new HashMap<String, Map<JacobObject, String>>();
 
-	/**
+    /**
-	 * adds a new thread storage area to rot
+     * adds a new thread storage area to rot
-	 * 
+     * 
-	 * @return Map corresponding to the thread that this call was made in
+     * @return Map corresponding to the thread that this call was made in
-	 */
+     */
-	protected synchronized static Map<JacobObject, String> addThread() {
+    protected synchronized static Map<JacobObject, String> addThread() {
-		Map<JacobObject, String> tab = rot.get();
+        // should use the id here instead of the name because the name can be
-		if (tab == null) {
+        // changed
-			if (JacobObject.isDebugEnabled()) {
+        String t_name = Thread.currentThread().getName();
-				JacobObject.debug("ROT: Automatic GC flag == "
+        if (rot.containsKey(t_name)) {
-						+ USE_AUTOMATIC_GARBAGE_COLLECTION);
+            // nothing to do
-			}
+        } else {
-			if (!USE_AUTOMATIC_GARBAGE_COLLECTION) {
+            Map<JacobObject, String> tab = null;
-				tab = new HashMap<JacobObject, String>();
+            if (JacobObject.isDebugEnabled()) {
-			} else {
+                JacobObject.debug("ROT: Automatic GC flag == "
-				tab = new WeakHashMap<JacobObject, String>();
+                        + USE_AUTOMATIC_GARBAGE_COLLECTION);
-			}
+            }
-			rot.set(tab);
+            if (!USE_AUTOMATIC_GARBAGE_COLLECTION) {
-		}
+                tab = new HashMap<JacobObject, String>();
-		return tab;
+            } else {
-	}
+                tab = new WeakHashMap<JacobObject, String>();
+            }
+            rot.put(t_name, tab);
+        }
+        return getThreadObjects(false);
+    }
 
-	/**
+    /**
-	 * Returns the pool for this thread if it exists. can create a new one if
+     * Returns the pool for this thread if it exists. can create a new one if
-	 * you wish by passing in TRUE
+     * you wish by passing in TRUE
-	 * 
+     * 
-	 * @param createIfDoesNotExist
+     * @param createIfDoesNotExist
-	 * @return Map the collection that holds the objects created in the current
+     * @return Map the collection that holds the objects created in the current
-	 *         thread
+     *         thread
-	 */
+     */
-	protected synchronized static Map<JacobObject, String> getThreadObjects(
+    protected synchronized static Map<JacobObject, String> getThreadObjects(
-			boolean createIfDoesNotExist) {
+            boolean createIfDoesNotExist) {
-		Map<JacobObject, String> tab = rot.get();
+        String t_name = Thread.currentThread().getName();
-		if (tab == null && createIfDoesNotExist) {
+        if (!rot.containsKey(t_name) && createIfDoesNotExist) {
-			tab = addThread();
+            addThread();
-		}
+        }
-		return tab;
+        return rot.get(t_name);
-	}
+    }
 
-	/**
+    /**
-	 * Iterates across all of the entries in the Hashmap in the rot that
+     * Iterates across all of the entries in the Hashmap in the rot that
-	 * corresponds to this thread. This calls safeRelease() on each entry and
+     * corresponds to this thread. This calls safeRelease() on each entry and
-	 * then clears the map when done and removes it from the rot. All traces of
+     * then clears the map when done and removes it from the rot. All traces of
-	 * this thread's objects will disappear. This is called by COMThread in the
+     * this thread's objects will disappear. This is called by COMThread in the
-	 * tear down and provides a synchronous way of releasing memory
+     * tear down and provides a synchronous way of releasing memory
-	 */
+     */
-	protected static void clearObjects() {
+    protected static void clearObjects() {
-		Map<JacobObject, String> tab = getThreadObjects(false);
+        if (JacobObject.isDebugEnabled()) {
-		if (tab != null) {
+            JacobObject.debug("ROT: " + rot.keySet().size()
-			if (JacobObject.isDebugEnabled()) {
+                    + " thread tables exist");
-				JacobObject.debug("ROT: " + tab.keySet().size()
+        }
-						+ " objects to clear in this thread's ROT ");
-			}
-			// walk the values
-			Iterator<JacobObject> it = tab.keySet().iterator();
-			while (it.hasNext()) {
-				JacobObject o = it.next();
-				if (o != null
-				// can't use this cause creates a Variant if calling SafeAray
-				// and we get an exception modifying the collection while
-				// iterating
-				// && o.toString() != null
-				) {
-					if (JacobObject.isDebugEnabled()) {
-						if (o instanceof SafeArray) {
-							// SafeArray create more objects when calling
-							// toString()
-							// which causes a concurrent modification exception
-							// in HashMap
-							JacobObject.debug("ROT: removing "
-									+ o.getClass().getName());
-						} else {
-							// Variant toString() is probably always bad in here
-							JacobObject.debug("ROT: removing " + o.hashCode()
-									+ "->" + o.getClass().getName());
-						}
-					}
-					o.safeRelease();
-				}
-			}
-			// empty the collection
-			tab.clear();
-			// remove the collection from rot
-			ROT.removeThread();
-			if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("ROT: thread table cleared and removed");
-			}
-		} else {
-			if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("ROT: nothing to clear!");
-			}
-		}
-	}
 
-	/**
+        Map<JacobObject, String> tab = getThreadObjects(false);
-	 * Removes the map from the rot that is associated with the current thread.
+        if (tab != null) {
-	 */
+            if (JacobObject.isDebugEnabled()) {
-	private synchronized static void removeThread() {
+                JacobObject.debug("ROT: " + tab.keySet().size()
-		rot.remove();
+                        + " objects to clear in this thread's ROT ");
-	}
+            }
+            // walk the values
+            Iterator<JacobObject> it = tab.keySet().iterator();
+            while (it.hasNext()) {
+                JacobObject o = it.next();
+                if (o != null
+                // can't use this cause creates a Variant if calling SafeAray
+                // and we get an exception modifying the collection while
+                // iterating
+                // && o.toString() != null
+                ) {
+                    if (JacobObject.isDebugEnabled()) {
+                        if (o instanceof SafeArray) {
+                            // SafeArray create more objects when calling
+                            // toString()
+                            // which causes a concurrent modification exception
+                            // in HashMap
+                            JacobObject.debug("ROT: removing "
+                                    + o.getClass().getName());
+                        } else {
+                            // Variant toString() is probably always bad in here
+                            JacobObject.debug("ROT: removing " + o.hashCode()
+                                    + "->" + o.getClass().getName());
+                        }
+                    }
+                    o.safeRelease();
+                }
+            }
+            // empty the collection
+            tab.clear();
+            // remove the collection from rot
+            ROT.removeThread();
+            if (JacobObject.isDebugEnabled()) {
+                JacobObject.debug("ROT: thread table cleared and removed");
+            }
+        } else {
+            if (JacobObject.isDebugEnabled()) {
+                JacobObject.debug("ROT: nothing to clear!");
+            }
+        }
+    }
 
-	/**
+    /**
-	 * @deprecated the java model leave the responsibility of clearing up
+     * Removes the map from the rot that is associated with the current thread.
-	 *             objects to the Garbage Collector. Our programming model
+     */
-	 *             should not require that the user specifically remove object
+    private synchronized static void removeThread() {
-	 *             from the thread. <br>
+        // should this see if it exists first?
-	 *             This will remove an object from the ROT <br>
+        rot.remove(Thread.currentThread().getName());
-	 *             This does not need to be synchronized because only the rot
+    }
-	 *             modification related methods need to synchronized. Each
-	 *             individual map is only modified in a single thread.
-	 * @param o
-	 */
-	@Deprecated
-	protected static void removeObject(JacobObject o) {
-		Map<JacobObject, String> tab = ROT.getThreadObjects(false);
-		if (tab != null) {
-			tab.remove(o);
-		}
-		o.safeRelease();
-	}
 
-	/**
+    /**
-	 * Adds an object to the HashMap for the current thread. <br>
+     * @deprecated the java model leave the responsibility of clearing up
-	 * <p>
+     *             objects to the Garbage Collector. Our programming model
-	 * This method does not need to be threaded because the only concurrent
+     *             should not require that the user specifically remove object
-	 * modification risk is on the hash map that contains all of the thread
+     *             from the thread. <br>
-	 * related hash maps. The individual thread related maps are only used on a
+     *             This will remove an object from the ROT <br>
-	 * per thread basis so there isn't a locking issue.
+     *             This does not need to be synchronized because only the rot
-	 * <p>
+     *             modification related methods need to synchronized. Each
-	 * In addition, this method cannot be threaded because it calls
+     *             individual map is only modified in a single thread.
-	 * ComThread.InitMTA. The ComThread object has some methods that call ROT so
+     * @param o
-	 * we could end up deadlocked. This method should be safe without the
+     */
-	 * synchronization because the ROT works on per thread basis and the methods
+    @Deprecated
-	 * that add threads and remove thread related entries are all synchronized
+    protected static void removeObject(JacobObject o) {
-	 * 
+        Map<JacobObject, String> tab = ROT.getThreadObjects(false);
-	 * 
+        if (tab != null) {
-	 * @param o
+            tab.remove(o);
-	 */
+        }
-	protected static void addObject(JacobObject o) {
+        o.safeRelease();
-		String shouldIncludeClassInROT = "true";
+    }
-		// only call System.getProperty if we are not including all classes in
-		// the ROT. This lets us run with standard Jacob behavior in Applets
-		// without the security exception raised by System.getProperty in the
-		// flow
-		if (!ROT.INCLUDE_ALL_CLASSES_IN_ROT) {
-			shouldIncludeClassInROT = System.getProperty(o.getClass().getName()
-					+ PUT_IN_ROT_SUFFIX, "true");
-		}
-		if (shouldIncludeClassInROT.equalsIgnoreCase("false")) {
-			if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("JacobObject: New instance of "
-						+ o.getClass().getName() + " not added to ROT");
-			}
-		} else {
-			// first see if we have a table for this thread
-			Map<JacobObject, String> tab = getThreadObjects(false);
-			if (tab == null) {
-				// this thread has not been initialized as a COM thread
-				// so make it part of MTA for backwards compatibility
-				ComThread.InitMTA(false);
-				// don't really need the "true" because the InitMTA will have
-				// called back to the ROT to create a table for this thread
-				tab = getThreadObjects(true);
-			}
-			if (JacobObject.isDebugEnabled()) {
-				JacobObject.debug("ROT: adding " + o + "->"
-						+ o.getClass().getName()
-						+ " table size prior to addition:" + tab.size());
-			}
-			// add the object to the table that is specific to this thread
-			if (tab != null) {
-				tab.put(o, null);
-			}
-		}
-	}
 
-	/**
+    /**
-	 * ROT can't be a subclass of JacobObject because of the way ROT pools are
+     * Adds an object to the HashMap for the current thread. <br>
-	 * managed so we force a DLL load here by referencing JacobObject
+     * <p>
-	 */
+     * This method does not need to be threaded because the only concurrent
-	static {
+     * modification risk is on the hash map that contains all of the thread
-		LibraryLoader.loadJacobLibrary();
+     * related hash maps. The individual thread related maps are only used on a
-	}
+     * per thread basis so there isn't a locking issue.
+     * <p>
+     * In addition, this method cannot be threaded because it calls
+     * ComThread.InitMTA. The ComThread object has some methods that call ROT so
+     * we could end up deadlocked. This method should be safe without the
+     * synchronization because the ROT works on per thread basis and the methods
+     * that add threads and remove thread related entries are all synchronized
+     * 
+     * 
+     * @param o
+     */
+    protected static void addObject(JacobObject o) {
+        String shouldIncludeClassInROT = "true";
+        // only call System.getProperty if we are not including all classes in
+        // the ROT. This lets us run with standard Jacob behavior in Applets
+        // without the security exception raised by System.getProperty in the
+        // flow
+        if (!ROT.INCLUDE_ALL_CLASSES_IN_ROT) {
+            shouldIncludeClassInROT = System.getProperty(o.getClass().getName()
+                    + PUT_IN_ROT_SUFFIX, "true");
+        }
+        if (shouldIncludeClassInROT.equalsIgnoreCase("false")) {
+            if (JacobObject.isDebugEnabled()) {
+                JacobObject.debug("JacobObject: New instance of "
+                        + o.getClass().getName() + " not added to ROT");
+            }
+        } else {
+            // first see if we have a table for this thread
+            Map<JacobObject, String> tab = getThreadObjects(false);
+            if (tab == null) {
+                // this thread has not been initialized as a COM thread
+                // so make it part of MTA for backwards compatibility
+                ComThread.InitMTA(false);
+                // don't really need the "true" because the InitMTA will have
+                // called back to the ROT to create a table for this thread
+                tab = getThreadObjects(true);
+            }
+            if (JacobObject.isDebugEnabled()) {
+                JacobObject.debug("ROT: adding " + o + "->"
+                        + o.getClass().getName()
+                        + " table size prior to addition:" + tab.size());
+            }
+            // add the object to the table that is specific to this thread
+            if (tab != null) {
+                tab.put(o, null);
+            }
+        }
+    }
+
+    /**
+     * ROT can't be a subclass of JacobObject because of the way ROT pools are
+     * managed so we force a DLL load here by referencing JacobObject
+     */
+    static {
+        LibraryLoader.loadJacobLibrary();
+    }
 
 }

src/main/java/com/jacob/com/STA.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -25,77 +44,77 @@ package com.jacob.com;
  * component that wants to run in an STA other than the main STA.
  */
 public class STA extends Thread {
-	/**
+    /**
-	 * referenced by STA.cpp
+     * referenced by STA.cpp
-	 */
+     */
-	public int threadID;
+    public int threadID;
 
-	/**
+    /**
-	 * constructor for STA
+     * constructor for STA
-	 */
+     */
-	public STA() {
+    public STA() {
-		start(); // start the thread
+        start(); // start the thread
-	}
+    }
 
-	/*
+    /*
-	 * (non-Javadoc)
+     * (non-Javadoc)
-	 * 
+     * 
-	 * @see java.lang.Thread#run()
+     * @see java.lang.Thread#run()
-	 */
+     */
-	public void run() {
+    public void run() {
-		// init COM
+        // init COM
-		ComThread.InitSTA();
+        ComThread.InitSTA();
-		if (OnInit()) {
+        if (OnInit()) {
-			// this call blocks in the win32 message loop
+            // this call blocks in the win32 message loop
-			// until quitMessagePump is called
+            // until quitMessagePump is called
-			doMessagePump();
+            doMessagePump();
-		}
+        }
-		OnQuit();
+        OnQuit();
-		// uninit COM
+        // uninit COM
-		ComThread.Release();
+        ComThread.Release();
-	}
+    }
 
-	/**
+    /**
-	 * Override this method to create and initialize any COM component that you
+     * Override this method to create and initialize any COM component that you
-	 * want to run in this thread. If anything fails, return false to terminate
+     * want to run in this thread. If anything fails, return false to terminate
-	 * the thread.
+     * the thread.
-	 * 
+     * 
-	 * @return always returns true
+     * @return always returns true
-	 */
+     */
-	public boolean OnInit() {
+    public boolean OnInit() {
-		return true;
+        return true;
-	}
+    }
 
-	/**
+    /**
-	 * Override this method to destroy any resource before the thread exits and
+     * Override this method to destroy any resource before the thread exits and
-	 * COM in uninitialized
+     * COM in uninitialized
-	 */
+     */
-	public void OnQuit() {
+    public void OnQuit() {
-		// there is nothing to see here
+        // there is nothing to see here
-	}
+    }
 
-	/**
+    /**
-	 * calls quitMessagePump
+     * calls quitMessagePump
-	 */
+     */
-	public void quit() {
+    public void quit() {
-		quitMessagePump();
+        quitMessagePump();
-	}
+    }
 
-	/**
+    /**
-	 * run a message pump for the main STA
+     * run a message pump for the main STA
-	 */
+     */
-	public native void doMessagePump();
+    public native void doMessagePump();
 
-	/**
+    /**
-	 * quit message pump for the main STA
+     * quit message pump for the main STA
-	 */
+     */
-	public native void quitMessagePump();
+    public native void quitMessagePump();
 
-	/**
+    /**
-	 * STA isn't a subclass of JacobObject so a reference to it doesn't load the
+     * STA isn't a subclass of JacobObject so a reference to it doesn't load the
-	 * DLL without this
+     * DLL without this
-	 */
+     */
-	static {
+    static {
-		LibraryLoader.loadJacobLibrary();
+        LibraryLoader.loadJacobLibrary();
-	}
+    }
 }

src/main/java/com/jacob/com/VariantUtilities.java

@@ -1,3 +1,41 @@
+/**
+ * This file is part of jlibcom.
+ *
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
+ *
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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 jlibcom. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 /**
  * 
  */
@@ -13,490 +51,485 @@ import java.util.Date;
  * A utility class used to convert between Java objects and Variants
  */
 public final class VariantUtilities {
-	private VariantUtilities() {
+    private VariantUtilities() {
-		// utility class with only static methods don't need constructors
+        // utility class with only static methods don't need constructors
-	}
+    }
 
-	/**
+    /**
-	 * Populates a variant object from a java object. This method attempts to
+     * Populates a variant object from a java object. This method attempts to
-	 * figure out the appropriate Variant type
+     * figure out the appropriate Variant type
-	 * 
+     * 
-	 * @param targetVariant
+     * @param targetVariant
-	 * @param pValueObject
+     * @param pValueObject
-	 * @param fByRef
+     * @param fByRef
-	 */
+     */
-	protected static void populateVariant(Variant targetVariant,
+    protected static void populateVariant(Variant targetVariant,
-			Object pValueObject, boolean fByRef) {
+            Object pValueObject, boolean fByRef) {
-		if (pValueObject == null) {
+        if (pValueObject == null) {
-			targetVariant.putEmpty();
+            targetVariant.putEmpty();
-		} else if (pValueObject instanceof Integer) {
+        } else if (pValueObject instanceof Integer) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putIntRef(((Integer) pValueObject).intValue());
+                targetVariant.putIntRef(((Integer) pValueObject).intValue());
-			} else {
+            } else {
-				targetVariant.putInt(((Integer) pValueObject).intValue());
+                targetVariant.putInt(((Integer) pValueObject).intValue());
-			}
+            }
-		} else if (pValueObject instanceof Short) {
+        } else if (pValueObject instanceof Short) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putShortRef(((Short) pValueObject).shortValue());
+                targetVariant.putShortRef(((Short) pValueObject).shortValue());
-			} else {
+            } else {
-				targetVariant.putShort(((Short) pValueObject).shortValue());
+                targetVariant.putShort(((Short) pValueObject).shortValue());
-			}
+            }
-		} else if (pValueObject instanceof String) {
+        } else if (pValueObject instanceof String) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putStringRef((String) pValueObject);
+                targetVariant.putStringRef((String) pValueObject);
-			} else {
+            } else {
-				targetVariant.putString((String) pValueObject);
+                targetVariant.putString((String) pValueObject);
-			}
+            }
-		} else if (pValueObject instanceof Boolean) {
+        } else if (pValueObject instanceof Boolean) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putBooleanRef(((Boolean) pValueObject)
+                targetVariant.putBooleanRef(((Boolean) pValueObject)
-						.booleanValue());
+                        .booleanValue());
-			} else {
+            } else {
-				targetVariant.putBoolean(((Boolean) pValueObject)
+                targetVariant.putBoolean(((Boolean) pValueObject)
-						.booleanValue());
+                        .booleanValue());
-			}
+            }
-		} else if (pValueObject instanceof Double) {
+        } else if (pValueObject instanceof Double) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putDoubleRef(((Double) pValueObject)
+                targetVariant.putDoubleRef(((Double) pValueObject)
-						.doubleValue());
+                        .doubleValue());
-			} else {
+            } else {
-				targetVariant.putDouble(((Double) pValueObject).doubleValue());
+                targetVariant.putDouble(((Double) pValueObject).doubleValue());
-			}
+            }
-		} else if (pValueObject instanceof Float) {
+        } else if (pValueObject instanceof Float) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putFloatRef(((Float) pValueObject).floatValue());
+                targetVariant.putFloatRef(((Float) pValueObject).floatValue());
-			} else {
+            } else {
-				targetVariant.putFloat(((Float) pValueObject).floatValue());
+                targetVariant.putFloat(((Float) pValueObject).floatValue());
-			}
+            }
-		} else if (pValueObject instanceof BigDecimal) {
+        } else if (pValueObject instanceof BigDecimal) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putDecimalRef(((BigDecimal) pValueObject));
+                targetVariant.putDecimalRef(((BigDecimal) pValueObject));
-			} else {
+            } else {
-				targetVariant.putDecimal(((BigDecimal) pValueObject));
+                targetVariant.putDecimal(((BigDecimal) pValueObject));
-			}
+            }
-		} else if (pValueObject instanceof Byte) {
+        } else if (pValueObject instanceof Byte) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putByteRef(((Byte) pValueObject).byteValue());
+                targetVariant.putByteRef(((Byte) pValueObject).byteValue());
-			} else {
+            } else {
-				targetVariant.putByte(((Byte) pValueObject).byteValue());
+                targetVariant.putByte(((Byte) pValueObject).byteValue());
-			}
+            }
-		} else if (pValueObject instanceof Date) {
+        } else if (pValueObject instanceof Date) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putDateRef((Date) pValueObject);
+                targetVariant.putDateRef((Date) pValueObject);
-			} else {
+            } else {
-				targetVariant.putDate((Date) pValueObject);
+                targetVariant.putDate((Date) pValueObject);
-			}
+            }
-		} else if (pValueObject instanceof Long) {
+        } else if (pValueObject instanceof Long) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putLongRef(((Long) pValueObject).longValue());
+                targetVariant.putLongRef(((Long) pValueObject).longValue());
-			} else {
+            } else {
-				targetVariant.putLong(((Long) pValueObject).longValue());
+                targetVariant.putLong(((Long) pValueObject).longValue());
-			}
+            }
-		} else if (pValueObject instanceof Currency) {
+        } else if (pValueObject instanceof Currency) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putCurrencyRef(((Currency) pValueObject));
+                targetVariant.putCurrencyRef(((Currency) pValueObject));
-			} else {
+            } else {
-				targetVariant.putCurrency(((Currency) pValueObject));
+                targetVariant.putCurrency(((Currency) pValueObject));
-			}
+            }
-		} else if (pValueObject instanceof SafeArray) {
+        } else if (pValueObject instanceof SafeArray) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putSafeArrayRef((SafeArray) pValueObject);
+                targetVariant.putSafeArrayRef((SafeArray) pValueObject);
-			} else {
+            } else {
-				targetVariant.putSafeArray((SafeArray) pValueObject);
+                targetVariant.putSafeArray((SafeArray) pValueObject);
-			}
+            }
-		} else if (pValueObject instanceof Dispatch) {
+        } else if (pValueObject instanceof Dispatch) {
-			if (fByRef) {
+            if (fByRef) {
-				targetVariant.putDispatchRef((Dispatch) pValueObject);
+                targetVariant.putDispatchRef((Dispatch) pValueObject);
-			} else {
+            } else {
-				targetVariant.putDispatch((Dispatch) pValueObject);
+                targetVariant.putDispatch((Dispatch) pValueObject);
-			}
+            }
-		} else if (pValueObject instanceof Variant) {
+        } else if (pValueObject instanceof Variant) {
-			// newly added 1.12-pre6 to support VT_VARIANT
+            // newly added 1.12-pre6 to support VT_VARIANT
-			targetVariant.putVariant(pValueObject);
+            targetVariant.putVariant(pValueObject);
-		} else {
+        } else {
-			// sourceforge patch 2171967
+            // sourceforge patch 2171967
-			// used to rely on coercion but sometimes crashed VM
+            // used to rely on coercion but sometimes crashed VM
-			throw new NotImplementedException(
+            throw new NotImplementedException(
-					"populateVariant() not implemented for "
+                    "populateVariant() not implemented for "
-							+ pValueObject.getClass());
+                            + pValueObject.getClass());
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Map arguments based on msdn documentation. This method relies on the
+     * Map arguments based on msdn documentation. This method relies on the
-	 * variant constructor except for arrays.
+     * variant constructor except for arrays.
-	 * 
+     * 
-	 * @param objectToBeMadeIntoVariant
+     * @param objectToBeMadeIntoVariant
-	 * @return Variant that represents the object
+     * @return Variant that represents the object
-	 */
+     */
-	protected static Variant objectToVariant(Object objectToBeMadeIntoVariant) {
+    protected static Variant objectToVariant(Object objectToBeMadeIntoVariant) {
-		if (objectToBeMadeIntoVariant == null) {
+        if (objectToBeMadeIntoVariant == null) {
-			return new Variant();
+            return new Variant();
-		} else if (objectToBeMadeIntoVariant instanceof Variant) {
+        } else if (objectToBeMadeIntoVariant instanceof Variant) {
-			// if a variant was passed in then be a slacker and just return it
+            // if a variant was passed in then be a slacker and just return it
-			return (Variant) objectToBeMadeIntoVariant;
+            return (Variant) objectToBeMadeIntoVariant;
-		} else if (objectToBeMadeIntoVariant.getClass().isArray()) {
+        } else if (objectToBeMadeIntoVariant.getClass().isArray()) {
-			// automatically convert arrays using reflection
+            // automatically convert arrays using reflection
-			// handle it differently based on the type of array
+            // handle it differently based on the type of array
-			// added primitive support sourceforge 2762275
+            // added primitive support sourceforge 2762275
-			SafeArray sa = null;
+            SafeArray sa = null;
-			int len1 = Array.getLength(objectToBeMadeIntoVariant);
+            int len1 = Array.getLength(objectToBeMadeIntoVariant);
-			Class componentType = objectToBeMadeIntoVariant.getClass()
+            Class componentType = objectToBeMadeIntoVariant.getClass()
-					.getComponentType();
+                    .getComponentType();
 
-			if (componentType.isArray()) { // array of arrays
+            if (componentType.isArray()) { // array of arrays
-				int max = 0;
+                int max = 0;
-				for (int i = 0; i < len1; i++) {
+                for (int i = 0; i < len1; i++) {
-					Object e1 = Array.get(objectToBeMadeIntoVariant, i);
+                    Object e1 = Array.get(objectToBeMadeIntoVariant, i);
-					int len2 = Array.getLength(e1);
+                    int len2 = Array.getLength(e1);
-					if (max < len2) {
+                    if (max < len2) {
-						max = len2;
+                        max = len2;
-					}
+                    }
-				}
+                }
-				sa = new SafeArray(Variant.VariantVariant, len1, max);
+                sa = new SafeArray(Variant.VariantVariant, len1, max);
-				for (int i = 0; i < len1; i++) {
+                for (int i = 0; i < len1; i++) {
-					Object e1 = Array.get(objectToBeMadeIntoVariant, i);
+                    Object e1 = Array.get(objectToBeMadeIntoVariant, i);
-					for (int j = 0; j < Array.getLength(e1); j++) {
+                    for (int j = 0; j < Array.getLength(e1); j++) {
-						sa.setVariant(i, j, objectToVariant(Array.get(e1, j)));
+                        sa.setVariant(i, j, objectToVariant(Array.get(e1, j)));
-					}
+                    }
-				}
+                }
-			} else if (byte.class.equals(componentType)) {
+            } else if (byte.class.equals(componentType)) {
-				byte[] arr = (byte[]) objectToBeMadeIntoVariant;
+                byte[] arr = (byte[]) objectToBeMadeIntoVariant;
-				sa = new SafeArray(Variant.VariantByte, len1);
+                sa = new SafeArray(Variant.VariantByte, len1);
-				for (int i = 0; i < len1; i++) {
+                for (int i = 0; i < len1; i++) {
-					sa.setByte(i, arr[i]);
+                    sa.setByte(i, arr[i]);
-				}
+                }
-			} else if (int.class.equals(componentType)) {
+            } else if (int.class.equals(componentType)) {
-				int[] arr = (int[]) objectToBeMadeIntoVariant;
+                int[] arr = (int[]) objectToBeMadeIntoVariant;
-				sa = new SafeArray(Variant.VariantInt, len1);
+                sa = new SafeArray(Variant.VariantInt, len1);
-				for (int i = 0; i < len1; i++) {
+                for (int i = 0; i < len1; i++) {
-					sa.setInt(i, arr[i]);
+                    sa.setInt(i, arr[i]);
-				}
+                }
-			} else if (double.class.equals(componentType)) {
+            } else if (double.class.equals(componentType)) {
-				double[] arr = (double[]) objectToBeMadeIntoVariant;
+                double[] arr = (double[]) objectToBeMadeIntoVariant;
-				sa = new SafeArray(Variant.VariantDouble, len1);
+                sa = new SafeArray(Variant.VariantDouble, len1);
-				for (int i = 0; i < len1; i++) {
+                for (int i = 0; i < len1; i++) {
-					sa.setDouble(i, arr[i]);
+                    sa.setDouble(i, arr[i]);
-				}
+                }
-			} else if (long.class.equals(componentType)) {
+            } else if (long.class.equals(componentType)) {
-				long[] arr = (long[]) objectToBeMadeIntoVariant;
+                long[] arr = (long[]) objectToBeMadeIntoVariant;
-				sa = new SafeArray(Variant.VariantLongInt, len1);
+                sa = new SafeArray(Variant.VariantLongInt, len1);
-				for (int i = 0; i < len1; i++) {
+                for (int i = 0; i < len1; i++) {
-					sa.setLong(i, arr[i]);
+                    sa.setLong(i, arr[i]);
-				}
+                }
-			} else {
+            } else {
-				// array of object
+                // array of object
-				sa = new SafeArray(Variant.VariantVariant, len1);
+                sa = new SafeArray(Variant.VariantVariant, len1);
-				for (int i = 0; i < len1; i++) {
+                for (int i = 0; i < len1; i++) {
-					sa.setVariant(i, objectToVariant(Array.get(
+                    sa.setVariant(i, objectToVariant(Array.get(
-							objectToBeMadeIntoVariant, i)));
+                            objectToBeMadeIntoVariant, i)));
-				}
+                }
-			}
+            }
-			Variant returnVariant = new Variant();
+            Variant returnVariant = new Variant();
-			populateVariant(returnVariant, sa, false);
+            populateVariant(returnVariant, sa, false);
-			return returnVariant;
+            return returnVariant;
-		} else {
+        } else {
-			// rely on populateVariant to throw an exception if its an
+            // rely on populateVariant to throw an exception if its an
-			// invalid type
+            // invalid type
-			Variant returnVariant = new Variant();
+            Variant returnVariant = new Variant();
-			populateVariant(returnVariant, objectToBeMadeIntoVariant, false);
+            populateVariant(returnVariant, objectToBeMadeIntoVariant, false);
-			return returnVariant;
+            return returnVariant;
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * converts an array of objects into an array of Variants by repeatedly
+     * converts an array of objects into an array of Variants by repeatedly
-	 * calling obj2Variant(Object)
+     * calling obj2Variant(Object)
-	 * 
+     * 
-	 * @param arrayOfObjectsToBeConverted
+     * @param arrayOfObjectsToBeConverted
-	 * @return Variant[]
+     * @return Variant[]
-	 */
+     */
-	protected static Variant[] objectsToVariants(
+    protected static Variant[] objectsToVariants(
-			Object[] arrayOfObjectsToBeConverted) {
+            Object[] arrayOfObjectsToBeConverted) {
-		if (arrayOfObjectsToBeConverted instanceof Variant[]) {
+        Variant vArg[] = new Variant[arrayOfObjectsToBeConverted.length];
-			// just return the passed in array if it is a Variant array
+        for (int i = 0; i < arrayOfObjectsToBeConverted.length; i++) {
-			return (Variant[]) arrayOfObjectsToBeConverted;
+            vArg[i] = objectToVariant(arrayOfObjectsToBeConverted[i]);
-		} else {
+        }
-			Variant vArg[] = new Variant[arrayOfObjectsToBeConverted.length];
+        return vArg;
-			for (int i = 0; i < arrayOfObjectsToBeConverted.length; i++) {
+    }
-				vArg[i] = objectToVariant(arrayOfObjectsToBeConverted[i]);
-			}
-			return vArg;
-		}
-	}
 
-	/**
+    /**
-	 * Convert a JACOB Variant value to a Java object (type conversions).
+     * Convert a JACOB Variant value to a Java object (type conversions).
-	 * provided in Sourceforge feature request 959381. A fix was done to handle
+     * provided in Sourceforge feature request 959381. A fix was done to handle
-	 * byRef bug report 1607878.
+     * byRef bug report 1607878.
-	 * <p>
+     * <p>
-	 * Unlike other toXXX() methods, it does not do a type conversion except for
+     * Unlike other toXXX() methods, it does not do a type conversion except for
-	 * special data types (it shouldn't do any!)
+     * special data types (it shouldn't do any!)
-	 * <p>
+     * <p>
-	 * Converts Variant.VariantArray types to SafeArrays
+     * Converts Variant.VariantArray types to SafeArrays
-	 * 
+     * 
-	 * @return Corresponding Java object of the type matching the Variant type.
+     * @return Corresponding Java object of the type matching the Variant type.
-	 * @throws IllegalStateException
+     * @throws IllegalStateException
-	 *             if no underlying windows data structure
+     *             if no underlying windows data structure
-	 * @throws NotImplementedException
+     * @throws NotImplementedException
-	 *             if unsupported conversion is requested
+     *             if unsupported conversion is requested
-	 * @throws JacobException
+     * @throws JacobException
-	 *             if the calculated result was a JacobObject usually as a
+     *             if the calculated result was a JacobObject usually as a
-	 *             result of error
+     *             result of error
-	 */
+     */
-	protected static Object variantToObject(Variant sourceData) {
+    protected static Object variantToObject(Variant sourceData) {
-		Object result = null;
+        Object result = null;
 
-		short type = sourceData.getvt(); // variant type
+        short type = sourceData.getvt(); // variant type
 
-		if ((type & Variant.VariantArray) == Variant.VariantArray) { // array
+        if ((type & Variant.VariantArray) == Variant.VariantArray) { // array
-			// returned?
+            // returned?
-			SafeArray array = null;
+            SafeArray array = null;
-			type = (short) (type - Variant.VariantArray);
+            type = (short) (type - Variant.VariantArray);
-			// From SF Bug 1840487
+            // From SF Bug 1840487
-			// This did call toSafeArray(false) but that meant
+            // This did call toSafeArray(false) but that meant
-			// this was the only variantToObject() that didn't have its own
+            // this was the only variantToObject() that didn't have its own
-			// copy of the data so you would end up with weird run time
+            // copy of the data so you would end up with weird run time
-			// errors after some GC. So now we just get stupid about it and
+            // errors after some GC. So now we just get stupid about it and
-			// always make a copy just like toSafeArray() does.
+            // always make a copy just like toSafeArray() does.
-			array = sourceData.toSafeArray();
+            array = sourceData.toSafeArray();
-			result = array;
+            result = array;
-		} else { // non-array object returned
+        } else { // non-array object returned
-			switch (type) {
+            switch (type) {
-			case Variant.VariantEmpty: // 0
+            case Variant.VariantEmpty: // 0
-			case Variant.VariantNull: // 1
+            case Variant.VariantNull: // 1
-				break;
+                break;
-			case Variant.VariantShort: // 2
+            case Variant.VariantShort: // 2
-				result = new Short(sourceData.getShort());
+                result = new Short(sourceData.getShort());
-				break;
+                break;
-			case Variant.VariantShort | Variant.VariantByref: // 2
+            case Variant.VariantShort | Variant.VariantByref: // 2
-				result = new Short(sourceData.getShortRef());
+                result = new Short(sourceData.getShortRef());
-				break;
+                break;
-			case Variant.VariantInt: // 3
+            case Variant.VariantInt: // 3
-				result = new Integer(sourceData.getInt());
+                result = new Integer(sourceData.getInt());
-				break;
+                break;
-			case Variant.VariantInt | Variant.VariantByref: // 3
+            case Variant.VariantInt | Variant.VariantByref: // 3
-				result = new Integer(sourceData.getIntRef());
+                result = new Integer(sourceData.getIntRef());
-				break;
+                break;
-			case Variant.VariantFloat: // 4
+            case Variant.VariantFloat: // 4
-				result = new Float(sourceData.getFloat());
+                result = new Float(sourceData.getFloat());
-				break;
+                break;
-			case Variant.VariantFloat | Variant.VariantByref: // 4
+            case Variant.VariantFloat | Variant.VariantByref: // 4
-				result = new Float(sourceData.getFloatRef());
+                result = new Float(sourceData.getFloatRef());
-				break;
+                break;
-			case Variant.VariantDouble: // 5
+            case Variant.VariantDouble: // 5
-				result = new Double(sourceData.getDouble());
+                result = new Double(sourceData.getDouble());
-				break;
+                break;
-			case Variant.VariantDouble | Variant.VariantByref: // 5
+            case Variant.VariantDouble | Variant.VariantByref: // 5
-				result = new Double(sourceData.getDoubleRef());
+                result = new Double(sourceData.getDoubleRef());
-				break;
+                break;
-			case Variant.VariantCurrency: // 6
+            case Variant.VariantCurrency: // 6
-				result = sourceData.getCurrency();
+                result = sourceData.getCurrency();
-				break;
+                break;
-			case Variant.VariantCurrency | Variant.VariantByref: // 6
+            case Variant.VariantCurrency | Variant.VariantByref: // 6
-				result = sourceData.getCurrencyRef();
+                result = sourceData.getCurrencyRef();
-				break;
+                break;
-			case Variant.VariantDate: // 7
+            case Variant.VariantDate: // 7
-				result = sourceData.getJavaDate();
+                result = sourceData.getJavaDate();
-				break;
+                break;
-			case Variant.VariantDate | Variant.VariantByref: // 7
+            case Variant.VariantDate | Variant.VariantByref: // 7
-				result = sourceData.getJavaDateRef();
+                result = sourceData.getJavaDateRef();
-				break;
+                break;
-			case Variant.VariantString: // 8
+            case Variant.VariantString: // 8
-				result = sourceData.getString();
+                result = sourceData.getString();
-				break;
+                break;
-			case Variant.VariantString | Variant.VariantByref: // 8
+            case Variant.VariantString | Variant.VariantByref: // 8
-				result = sourceData.getStringRef();
+                result = sourceData.getStringRef();
-				break;
+                break;
-			case Variant.VariantDispatch: // 9
+            case Variant.VariantDispatch: // 9
-				result = sourceData.getDispatch();
+                result = sourceData.getDispatch();
-				break;
+                break;
-			case Variant.VariantDispatch | Variant.VariantByref: // 9
+            case Variant.VariantDispatch | Variant.VariantByref: // 9
-				result = sourceData.getDispatchRef(); // Can dispatches even
+                result = sourceData.getDispatchRef(); // Can dispatches even
-				// be byRef?
+                // be byRef?
-				break;
+                break;
-			case Variant.VariantError: // 10
+            case Variant.VariantError: // 10
-				result = new NotImplementedException(
+                result = new NotImplementedException(
-						"toJavaObject() Not implemented for VariantError");
+                        "toJavaObject() Not implemented for VariantError");
-				break;
+                break;
-			case Variant.VariantBoolean: // 11
+            case Variant.VariantBoolean: // 11
-				result = new Boolean(sourceData.getBoolean());
+                result = new Boolean(sourceData.getBoolean());
-				break;
+                break;
-			case Variant.VariantBoolean | Variant.VariantByref: // 11
+            case Variant.VariantBoolean | Variant.VariantByref: // 11
-				result = new Boolean(sourceData.getBooleanRef());
+                result = new Boolean(sourceData.getBooleanRef());
-				break;
+                break;
-			case Variant.VariantVariant: // 12 they are always by ref
+            case Variant.VariantVariant: // 12 they are always by ref
-				result = new NotImplementedException(
+                result = new NotImplementedException(
-						"toJavaObject() Not implemented for VariantVariant without ByRef");
+                        "toJavaObject() Not implemented for VariantVariant without ByRef");
-				break;
+                break;
-			case Variant.VariantVariant | Variant.VariantByref: // 12
+            case Variant.VariantVariant | Variant.VariantByref: // 12
-				result = sourceData.getVariant();
+                result = sourceData.getVariant();
-				break;
+                break;
-			case Variant.VariantObject: // 13
+            case Variant.VariantObject: // 13
-				result = new NotImplementedException(
+                result = new NotImplementedException(
-						"toJavaObject() Not implemented for VariantObject");
+                        "toJavaObject() Not implemented for VariantObject");
-				break;
+                break;
-			case Variant.VariantDecimal: // 14
+            case Variant.VariantDecimal: // 14
-				result = sourceData.getDecimal();
+                result = sourceData.getDecimal();
-				break;
+                break;
-			case Variant.VariantDecimal | Variant.VariantByref: // 14
+            case Variant.VariantDecimal | Variant.VariantByref: // 14
-				result = sourceData.getDecimalRef();
+                result = sourceData.getDecimalRef();
-				break;
+                break;
-			case Variant.VariantByte: // 17
+            case Variant.VariantByte: // 17
-				result = new Byte(sourceData.getByte());
+                result = new Byte(sourceData.getByte());
-				break;
+                break;
-			case Variant.VariantByte | Variant.VariantByref: // 17
+            case Variant.VariantByte | Variant.VariantByref: // 17
-				result = new Byte(sourceData.getByteRef());
+                result = new Byte(sourceData.getByteRef());
-				break;
+                break;
-			case Variant.VariantLongInt: // 20
+            case Variant.VariantLongInt: // 20
-				result = new Long(sourceData.getLong());
+                result = new Long(sourceData.getLong());
-				break;
+                break;
-			case Variant.VariantLongInt | Variant.VariantByref: // 20
+            case Variant.VariantLongInt | Variant.VariantByref: // 20
-				result = new Long(sourceData.getLongRef());
+                result = new Long(sourceData.getLongRef());
-				break;
+                break;
-			case Variant.VariantTypeMask: // 4095
+            case Variant.VariantTypeMask: // 4095
-				result = new NotImplementedException(
+                result = new NotImplementedException(
-						"toJavaObject() Not implemented for VariantBstrBlob/VariantTypeMask");
+                        "toJavaObject() Not implemented for VariantTypeMask");
-				break;
+                break;
-			case Variant.VariantArray: // 8192
+            case Variant.VariantArray: // 8192
-				result = new NotImplementedException(
+                result = new NotImplementedException(
-						"toJavaObject() Not implemented for VariantArray");
+                        "toJavaObject() Not implemented for VariantArray");
-				break;
+                break;
-			case Variant.VariantByref: // 16384
+            case Variant.VariantByref: // 16384
-				result = new NotImplementedException(
+                result = new NotImplementedException(
-						"toJavaObject() Not implemented for VariantByref");
+                        "toJavaObject() Not implemented for VariantByref");
-				break;
+                break;
-			default:
+            default:
-				result = new NotImplementedException("Unknown return type: "
+                result = new NotImplementedException("Unknown return type: "
-						+ type);
+                        + type);
-				// there was a "return result" here that caused defect 1602118
+                // there was a "return result" here that caused defect 1602118
-				// so it was removed
+                // so it was removed
-				break;
+                break;
-			}// switch (type)
+            }// switch (type)
 
-			if (result instanceof JacobException) {
+            if (result instanceof JacobException) {
-				throw (JacobException) result;
+                throw (JacobException) result;
-			}
+            }
-		}
+        }
 
-		return result;
+        return result;
-	}// toJava()
+    }// toJava()
 
-	/**
+    /**
-	 * Verifies that we have a scale 0 <= x <= 28 and now more than 96 bits of
+     * Verifies that we have a scale 0 <= x <= 28 and now more than 96 bits of
-	 * data. The roundToMSDecimal method will attempt to adjust a BigDecimal to
+     * data. The roundToMSDecimal method will attempt to adjust a BigDecimal to
-	 * pass this set of tests
+     * pass this set of tests
-	 * 
+     * 
-	 * @param in
+     * @param in
-	 * @throws IllegalArgumentException
+     * @throws IllegalArgumentException
-	 *             if out of bounds
+     *             if out of bounds
-	 */
+     */
-	protected static void validateDecimalScaleAndBits(BigDecimal in) {
+    protected static void validateDecimalScaleAndBits(BigDecimal in) {
-		BigInteger allWordBigInt = in.unscaledValue();
+        BigInteger allWordBigInt = in.unscaledValue();
-		if (in.scale() > 28) {
+        if (in.scale() > 28) {
-			// should this cast to a string and call putStringRef()?
+            // should this cast to a string and call putStringRef()?
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"VT_DECIMAL only supports a maximum scale of 28 and the passed"
+                    "VT_DECIMAL only supports a maximum scale of 28 and the passed"
-							+ " in value has a scale of " + in.scale());
+                            + " in value has a scale of " + in.scale());
-		} else if (in.scale() < 0) {
+        } else if (in.scale() < 0) {
-			// should this cast to a string and call putStringRef()?
+            // should this cast to a string and call putStringRef()?
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"VT_DECIMAL only supports a minimum scale of 0 and the passed"
+                    "VT_DECIMAL only supports a minimum scale of 0 and the passed"
-							+ " in value has a scale of " + in.scale());
+                            + " in value has a scale of " + in.scale());
-		} else if (allWordBigInt.bitLength() > 12 * 8) {
+        } else if (allWordBigInt.bitLength() > 12 * 8) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"VT_DECIMAL supports a maximum of "
+                    "VT_DECIMAL supports a maximum of "
-							+ 12
+                            + 12
-							* 8
+                            * 8
-							+ " bits not counting scale and the number passed in has "
+                            + " bits not counting scale and the number passed in has "
-							+ allWordBigInt.bitLength());
+                            + allWordBigInt.bitLength());
 
-		} else {
+        } else {
-			// no bounds problem to be handled
+            // no bounds problem to be handled
-		}
+        }
 
-	}
+    }
 
-	/**
+    /**
-	 * Largest possible number with scale set to 0
+     * Largest possible number with scale set to 0
-	 */
+     */
-	private static final BigDecimal LARGEST_DECIMAL = new BigDecimal(
+    private static final BigDecimal LARGEST_DECIMAL = new BigDecimal(
-			new BigInteger("ffffffffffffffffffffffff", 16));
+            new BigInteger("ffffffffffffffffffffffff", 16));
-	/**
+    /**
-	 * Smallest possible number with scale set to 0. MS doesn't support negative
+     * Smallest possible number with scale set to 0. MS doesn't support negative
-	 * scales like BigDecimal.
+     * scales like BigDecimal.
-	 */
+     */
-	private static final BigDecimal SMALLEST_DECIMAL = new BigDecimal(
+    private static final BigDecimal SMALLEST_DECIMAL = new BigDecimal(
-			new BigInteger("ffffffffffffffffffffffff", 16).negate());
+            new BigInteger("ffffffffffffffffffffffff", 16).negate());
 
-	/**
+    /**
-	 * Does any validation that couldn't have been fixed by rounding or scale
+     * Does any validation that couldn't have been fixed by rounding or scale
-	 * modification.
+     * modification.
-	 * 
+     * 
-	 * @param in
+     * @param in
-	 *            The BigDecimal to be validated
+     *            The BigDecimal to be validated
-	 * @throws IllegalArgumentException
+     * @throws IllegalArgumentException
-	 *             if the number is too large or too small or null
+     *             if the number is too large or too small or null
-	 */
+     */
-	protected static void validateDecimalMinMax(BigDecimal in) {
+    protected static void validateDecimalMinMax(BigDecimal in) {
-		if (in == null) {
+        if (in == null) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"null is not a supported Decimal value.");
+                    "null is not a supported Decimal value.");
-		} else if (LARGEST_DECIMAL.compareTo(in) < 0) {
+        } else if (LARGEST_DECIMAL.compareTo(in) < 0) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"Value too large for VT_DECIMAL data type:" + in.toString()
+                    "Value too large for VT_DECIMAL data type:" + in.toString()
-							+ " integer: " + in.toBigInteger().toString(16)
+                            + " integer: " + in.toBigInteger().toString(16)
-							+ " scale: " + in.scale());
+                            + " scale: " + in.scale());
-		} else if (SMALLEST_DECIMAL.compareTo(in) > 0) {
+        } else if (SMALLEST_DECIMAL.compareTo(in) > 0) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"Value too small for VT_DECIMAL data type:" + in.toString()
+                    "Value too small for VT_DECIMAL data type:" + in.toString()
-							+ " integer: " + in.toBigInteger().toString(16)
+                            + " integer: " + in.toBigInteger().toString(16)
-							+ " scale: " + in.scale());
+                            + " scale: " + in.scale());
-		}
+        }
 
-	}
+    }
 
-	/**
+    /**
-	 * Rounds the scale and bit length so that it will pass
+     * Rounds the scale and bit length so that it will pass
-	 * validateDecimalScaleBits(). Developers should call this method if they
+     * validateDecimalScaleBits(). Developers should call this method if they
-	 * really want MS Decimal and don't want to lose precision.
+     * really want MS Decimal and don't want to lose precision.
-	 * <p>
+     * <p>
-	 * Changing the scale on a number that can fit in an MS Decimal can change
+     * Changing the scale on a number that can fit in an MS Decimal can change
-	 * the number's representation enough that it will round to a number too
+     * the number's representation enough that it will round to a number too
-	 * large to be represented by an MS VT_DECIMAL
+     * large to be represented by an MS VT_DECIMAL
-	 * 
+     * 
-	 * @param sourceDecimal
+     * @param sourceDecimal
-	 * @return BigDecimal a new big decimal that was rounded to fit in an MS
+     * @return BigDecimal a new big decimal that was rounded to fit in an MS
-	 *         VT_DECIMAL
+     *         VT_DECIMAL
-	 */
+     */
-	public static BigDecimal roundToMSDecimal(BigDecimal sourceDecimal) {
+    public static BigDecimal roundToMSDecimal(BigDecimal sourceDecimal) {
-		BigInteger sourceDecimalIntComponent = sourceDecimal.unscaledValue();
+        BigInteger sourceDecimalIntComponent = sourceDecimal.unscaledValue();
-		BigDecimal destinationDecimal = new BigDecimal(
+        BigDecimal destinationDecimal = new BigDecimal(
-				sourceDecimalIntComponent, sourceDecimal.scale());
+                sourceDecimalIntComponent, sourceDecimal.scale());
-		int roundingModel = BigDecimal.ROUND_HALF_UP;
+        int roundingModel = BigDecimal.ROUND_HALF_UP;
-		validateDecimalMinMax(destinationDecimal);
+        validateDecimalMinMax(destinationDecimal);
-		// First limit the number of digits and then the precision.
+        // First limit the number of digits and then the precision.
-		// Try and round to 29 digits because we can sometimes do that
+        // Try and round to 29 digits because we can sometimes do that
-		BigInteger allWordBigInt;
+        BigInteger allWordBigInt;
-		allWordBigInt = destinationDecimal.unscaledValue();
+        allWordBigInt = destinationDecimal.unscaledValue();
-		if (allWordBigInt.bitLength() > 96) {
+        if (allWordBigInt.bitLength() > 96) {
-			destinationDecimal = destinationDecimal.round(new MathContext(29));
+            destinationDecimal = destinationDecimal.round(new MathContext(29));
-			// see if 29 digits uses more than 96 bits
+            // see if 29 digits uses more than 96 bits
-			if (allWordBigInt.bitLength() > 96) {
+            if (allWordBigInt.bitLength() > 96) {
-				// Dang. It was over 97 bits so shorten it one more digit to
+                // Dang. It was over 97 bits so shorten it one more digit to
-				// stay <= 96 bits
+                // stay <= 96 bits
-				destinationDecimal = destinationDecimal.round(new MathContext(
+                destinationDecimal = destinationDecimal.round(new MathContext(
-						28));
+                        28));
-			}
+            }
-		}
+        }
-		// the bit manipulations above may change the scale so do it afterwards
+        // the bit manipulations above may change the scale so do it afterwards
-		// round the scale to the max MS can support
+        // round the scale to the max MS can support
-		if (destinationDecimal.scale() > 28) {
+        if (destinationDecimal.scale() > 28) {
-			destinationDecimal = destinationDecimal.setScale(28, roundingModel);
+            destinationDecimal = destinationDecimal.setScale(28, roundingModel);
-		}
+        }
-		if (destinationDecimal.scale() < 0) {
+        if (destinationDecimal.scale() < 0) {
-			destinationDecimal = destinationDecimal.setScale(0, roundingModel);
+            destinationDecimal = destinationDecimal.setScale(0, roundingModel);
-		}
+        }
-		return destinationDecimal;
+        return destinationDecimal;
-	}
+    }
 }

src/main/java/com/jacob/com/VariantViaEvent.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -25,10 +44,10 @@ package com.jacob.com;
  */
 public class VariantViaEvent extends Variant {
 
-	/**
+    /**
-	 * Standard constructor used by JNI event handling layer
+     * Standard constructor used by JNI event handling layer
-	 */
+     */
-	public VariantViaEvent() {
+    public VariantViaEvent() {
-		super();
+        super();
-	}
+    }
 }

src/main/java/com/jacob/com/WrongThreadException.java

@@ -1,21 +1,40 @@
-/*
+/**
- * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * This file is part of jlibcom.
- * All rights reserved. Originator: Dan Adler (http://danadler.com).
- * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
  *
- * This library is free software; you can redistribute it and/or
+ * Copyright (C) 2014 Rik Veenboer <rik.veenboer@gmail.com>
- * 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,
+ * jlibcom 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * jlibcom 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the Free Software
+ * along with jlibcom. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *     Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ *     All rights reserved. Originator: Dan Adler (http://danadler.com).
+ *     Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ *     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 St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package com.jacob.com;
 
@@ -23,25 +42,25 @@ package com.jacob.com;
  * thrown in util.cpp
  */
 public class WrongThreadException extends JacobException {
-	/**
+    /**
-	 * identifier generated by Eclipse
+     * identifier generated by Eclipse
-	 */
+     */
-	private static final long serialVersionUID = 6308780364980228692L;
+    private static final long serialVersionUID = 6308780364980228692L;
 
-	/**
+    /**
-	 * standard 0 arg constructor with no message
+     * standard 0 arg constructor with no message
-	 * 
+     * 
-	 */
+     */
-	public WrongThreadException() {
+    public WrongThreadException() {
-		super("No Message Provided.");
+        super("No Message Provided.");
-	}
+    }
 
-	/**
+    /**
-	 * standard constructor with a string message
+     * standard constructor with a string message
-	 * 
+     * 
-	 * @param s
+     * @param s
-	 */
+     */
-	public WrongThreadException(String s) {
+    public WrongThreadException(String s) {
-		super(s);
+        super(s);
-	}
+    }
 }

src/sample/com/jacob/samples/MathProj/Math.cls

@@ -1,37 +1,37 @@
-VERSION 1.0 CLASS
+VERSION 1.0 CLASS
-BEGIN
+BEGIN
-  MultiUse = -1  'True
+  MultiUse = -1  'True
-  Persistable = 0  'NotPersistable
+  Persistable = 0  'NotPersistable
-  DataBindingBehavior = 0  'vbNone
+  DataBindingBehavior = 0  'vbNone
-  DataSourceBehavior  = 0  'vbNone
+  DataSourceBehavior  = 0  'vbNone
-  MTSTransactionMode  = 0  'NotAnMTSObject
+  MTSTransactionMode  = 0  'NotAnMTSObject
-END
+END
-Attribute VB_Name = "Math"
+Attribute VB_Name = "Math"
-Attribute VB_GlobalNameSpace = False
+Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = True
+Attribute VB_Creatable = True
-Attribute VB_PredeclaredId = False
+Attribute VB_PredeclaredId = False
-Attribute VB_Exposed = True
+Attribute VB_Exposed = True
-Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
+Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
-Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
+Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
-'To fire this event, use RaiseEvent with the following syntax:
+'To fire this event, use RaiseEvent with the following syntax:
-'RaiseEvent DoneAdd[(arg1, arg2, ... , argn)]
+'RaiseEvent DoneAdd[(arg1, arg2, ... , argn)]
-Public Event DoneAdd(result As Variant)
+Public Event DoneAdd(result As Variant)
-'To fire this event, use RaiseEvent with the following syntax:
+'To fire this event, use RaiseEvent with the following syntax:
-'RaiseEvent DoneMult[(arg1, arg2, ... , argn)]
+'RaiseEvent DoneMult[(arg1, arg2, ... , argn)]
-Public Event DoneMult(result As Variant)
+Public Event DoneMult(result As Variant)
-
+
-
+
-Public Function Mult(in1 As Variant, in2 As Variant) As Variant
+Public Function Mult(in1 As Variant, in2 As Variant) As Variant
-  Mult = in1 * in2
+  Mult = in1 * in2
-  RaiseEvent DoneMult(in1 * in2)
+  RaiseEvent DoneMult(in1 * in2)
-End Function
+End Function
-
+
-Public Function Add(in1 As Variant, in2 As Variant) As Variant
+Public Function Add(in1 As Variant, in2 As Variant) As Variant
-  Add = in1 + in2
+  Add = in1 + in2
-  RaiseEvent DoneAdd(in1 + in2)
+  RaiseEvent DoneAdd(in1 + in2)
-End Function
+End Function
-
+
-Public Function getNothing() As Variant
+Public Function getNothing() As Variant
-  Set getNothing = Nothing
+  Set getNothing = Nothing
-End Function
+End Function
-
+

src/sample/com/jacob/samples/MathProj/MathTest.java

@@ -0,0 +1,83 @@
+package com.jacob.samples.MathProj;
+
+import com.jacob.activeX.ActiveXComponent;
+import com.jacob.com.Dispatch;
+import com.jacob.com.DispatchEvents;
+import com.jacob.com.Variant;
+
+/**
+ * This example uses the MathTest sample VB COM DLL under the MathProj directory
+ * <p>
+ * May need to run with some command line options (including from inside
+ * Eclipse). Look in the docs area at the Jacob usage document for command line
+ * options.
+ */
+class MathTest {
+    /**
+     * standard main program to run the sample
+     * 
+     * @param args
+     *            command line parameters
+     */
+    public static void main(String[] args) {
+        MathTest me = new MathTest();
+        me.runTest();
+    }
+
+    /** default constructor */
+    public MathTest() {
+    }
+
+    /**
+     * not clear why we need a class and run method but that's the way it was
+     * written
+     */
+    public void runTest() {
+        // deprecated
+        // System.runFinalizersOnExit(true);
+        Dispatch test = new ActiveXComponent("MathTest.Math");
+        TestEvents te = new TestEvents();
+        DispatchEvents de = new DispatchEvents(test, te);
+        if (de == null) {
+            System.out
+                    .println("null returned when trying to create DispatchEvents");
+        }
+        System.out.println(Dispatch.call(test, "Add", new Variant(1),
+                new Variant(2)));
+        System.out.println(Dispatch.call(test, "Mult", new Variant(2),
+                new Variant(2)));
+        Variant v = Dispatch.call(test, "Mult", new Variant(2), new Variant(2));
+        // this should return false
+        System.out.println("v.isNull=" + v.isNull());
+        v = Dispatch.call(test, "getNothing");
+        // these should return nothing
+        System.out.println("v.isNull=" + v.isNull());
+        System.out.println("v.toDispatch=" + v.toDispatch());
+    }
+
+    /**
+     * 
+     * sample class to catch the events
+     * 
+     */
+    public class TestEvents {
+        /**
+         * catches the DoneAdd event
+         * 
+         * @param args
+         */
+        public void DoneAdd(Variant[] args) {
+            System.out.println("DoneAdd called in java");
+        }
+
+        /**
+         * catches the DoneMult event
+         * 
+         * @param args
+         */
+        public void DoneMult(Variant[] args) {
+            System.out.println("DoneMult called in java");
+        }
+    }
+
+}

src/sample/com/jacob/samples/MathProj/MathTest.vbp

@@ -1,35 +1,35 @@
-Type=OleDll
+Type=OleDll
-Class=Math; Math.cls
+Class=Math; Math.cls
-Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINNT\System32\StdOle2.Tlb#OLE Automation
+Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINNT\System32\StdOle2.Tlb#OLE Automation
-Startup="(None)"
+Startup="(None)"
-HelpFile=""
+HelpFile=""
-Title="MathTest"
+Title="MathTest"
-ExeName32="MathTest.dll"
+ExeName32="MathTest.dll"
-Command32=""
+Command32=""
-Name="MathTest"
+Name="MathTest"
-HelpContextID="0"
+HelpContextID="0"
-CompatibleMode="1"
+CompatibleMode="1"
-CompatibleEXE32="MathTest.dll"
+CompatibleEXE32="MathTest.dll"
-MajorVer=1
+MajorVer=1
-MinorVer=0
+MinorVer=0
-RevisionVer=0
+RevisionVer=0
-AutoIncrementVer=0
+AutoIncrementVer=0
-ServerSupportFiles=0
+ServerSupportFiles=0
-VersionCompanyName="Inventure America, Inc."
+VersionCompanyName="Inventure America, Inc."
-CompilationType=0
+CompilationType=0
-OptimizationType=0
+OptimizationType=0
-FavorPentiumPro(tm)=0
+FavorPentiumPro(tm)=0
-CodeViewDebugInfo=0
+CodeViewDebugInfo=0
-NoAliasing=0
+NoAliasing=0
-BoundsCheck=0
+BoundsCheck=0
-OverflowCheck=0
+OverflowCheck=0
-FlPointCheck=0
+FlPointCheck=0
-FDIVCheck=0
+FDIVCheck=0
-UnroundedFP=0
+UnroundedFP=0
-StartMode=1
+StartMode=1
-Unattended=0
+Unattended=0
-Retained=0
+Retained=0
-ThreadPerObject=0
+ThreadPerObject=0
-MaxNumberOfThreads=1
+MaxNumberOfThreads=1
-ThreadingModel=1
+ThreadingModel=1
-DebugStartupOption=0
+DebugStartupOption=0

src/sample/com/jacob/samples/MathProj/MathTest.vbw

@@ -1 +1 @@
-Math = 75, 13, 656, 554, 
+Math = 75, 13, 656, 554, 

src/sample/com/jacob/samples/access/Access.java

@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 1999-2004 Sourceforge JACOB Project.
+ * All rights reserved. Originator: Dan Adler (http://danadler.com).
+ * Get more information about JACOB at http://sourceforge.net/projects/jacob-project
+ *
+ * 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 St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+package com.jacob.samples.access;
+
+import com.jacob.activeX.ActiveXComponent;
+import com.jacob.com.ComThread;
+import com.jacob.com.Dispatch;
+import com.jacob.com.Variant;
+
+/**
+ * May need to run with some command line options (including from inside
+ * Eclipse). Look in the docs area at the Jacob usage document for command line
+ * options.
+ * 
+ */
+class Access {
+    /**
+     * the main loop for the test
+     * 
+     * @param args
+     * @throws Exception
+     */
+    public static void main(String[] args) throws Exception {
+        ComThread.InitSTA();
+        // original test used this
+        // ActiveXComponent ax = new ActiveXComponent("DAO.PrivateDBEngine");
+        // my xp box with a later release of access needed this
+        ActiveXComponent ax = new ActiveXComponent("DAO.PrivateDBEngine.35");
+        // this only works for access files pre-access-2000
+        // this line doesn't work on my xp box in Eclipse
+        // Dispatch db = open(ax, ".\\sample2.mdb");
+        // this works when running in eclipse because the test cases run pwd
+        // project root
+        Dispatch db = open(ax, "samples/com/jacob/samples/access/sample2.mdb");
+        String sql = "select * from MainTable";
+        // make a temporary querydef
+        Dispatch qd = Dispatch.call(db, "CreateQueryDef", "").toDispatch();
+        // set the SQL string on it
+        Dispatch.put(qd, "SQL", sql);
+        Variant result = getByQueryDef(qd);
+        // the 2-d safearray is transposed from what you might expect
+        System.out.println("resulting array is " + result.toSafeArray());
+        close(db);
+        System.out.println("about to call ComThread.Release()");
+        ComThread.Release();
+    }
+
+    /**
+     * Open a database
+     * 
+     * @param ax
+     * @param fileName
+     * @return dispatch object that was opened
+     */
+    public static Dispatch open(ActiveXComponent ax, String fileName) {
+        Variant f = new Variant(false);
+        // open the file in read-only mode
+        Variant[] args = new Variant[] { new Variant(fileName), f, f };
+        Dispatch openDB = ax.invoke("OpenDatabase", args).toDispatch();
+        return openDB;
+    }
+
+    /**
+     * Close a database
+     * 
+     * @param openDB
+     *            db to be closed
+     */
+    public static void close(Dispatch openDB) {
+        Dispatch.call(openDB, "Close");
+    }
+
+    /**
+     * Extract the values from the recordset
+     * 
+     * @param recset
+     * @return Variant that is the returned values
+     */
+    public static Variant getValues(Dispatch recset) {
+        Dispatch.callSub(recset, "moveFirst");
+        Variant vi = new Variant(4096);
+        Variant v = Dispatch.call(recset, "GetRows", vi);
+        return v;
+    }
+
+    /**
+     * should return ?? for the passed in ??
+     * 
+     * @param qd
+     * @return Variant results of query?
+     */
+    public static Variant getByQueryDef(Dispatch qd) {
+        // get a reference to the recordset
+        Dispatch recset = Dispatch.call(qd, "OpenRecordset").toDispatch();
+        // get the values as a safe array
+        String[] cols = getColumns(recset);
+        for (int i = 0; i < cols.length; i++) {
+            System.out.print(cols[i] + " ");
+        }
+        System.out.println("");
+        Variant vals = getValues(recset);
+        return vals;
+    }
+
+    /**
+     * gets the columns form the rec set
+     * 
+     * @param recset
+     * @return list of column names
+     */
+    public static String[] getColumns(Dispatch recset) {
+        Dispatch flds = Dispatch.get(recset, "Fields").toDispatch();
+        int n_flds = Dispatch.get(flds, "Count").getInt();
+        String[] s = new String[n_flds];
+        Variant vi = new Variant();
+        for (int i = 0; i < n_flds; i++) {
+            vi.putInt(i);
+            // must use the invoke method because this is a method call
+            // that wants to have a Dispatch.Get flag...
+            Dispatch fld = Dispatch.invoke(recset, "Fields", Dispatch.Get,
+                    new Object[] { vi }, new int[1]).toDispatch();
+            Variant name = Dispatch.get(fld, "Name");
+            s[i] = name.toString();
+        }
+        return s;
+    }
+}

src/sample/com/jacob/samples/ado/Command.java

@@ -0,0 +1,207 @@
+package com.jacob.samples.ado;
+
+import com.jacob.com.Dispatch;
+import com.jacob.com.Variant;
+
+/**
+ * Custom dispatch object to make it easy for us to provide application specific
+ * API.
+ * 
+ */
+public class Command extends Dispatch {
+    /**
+     * standard constructor
+     */
+    public Command() {
+        super("ADODB.Command");
+    }
+
+    /**
+     * This constructor is used instead of a case operation to turn a Dispatch
+     * object into a wider object - it must exist in every wrapper class whose
+     * instances may be returned from method calls wrapped in VT_DISPATCH
+     * Variants.
+     * 
+     * @param dispatchTarget
+     */
+    public Command(Dispatch dispatchTarget) {
+        super(dispatchTarget);
+    }
+
+    /**
+     * runs the "Properties" command
+     * 
+     * @return the properties
+     */
+    public Variant getProperties() {
+        return Dispatch.get(this, "Properties");
+    }
+
+    /**
+     * runs the "ActiveConnection" command
+     * 
+     * @return a Connection object
+     */
+    public Connection getActiveConnection() {
+        return new Connection(Dispatch.get(this, "ActiveConnection")
+                .toDispatch());
+    }
+
+    /**
+     * Sets the "ActiveConnection" object
+     * 
+     * @param ppvObject
+     *            the new connection
+     */
+    public void setActiveConnection(Connection ppvObject) {
+        Dispatch.put(this, "ActiveConnection", ppvObject);
+    }
+
+    /**
+     * 
+     * @return the results from "CommandText"
+     */
+    public String getCommandText() {
+        return Dispatch.get(this, "CommandText").toString();
+    }
+
+    /**
+     * 
+     * @param pbstr
+     *            the new "CommandText"
+     */
+    public void setCommandText(String pbstr) {
+        Dispatch.put(this, "CommandText", pbstr);
+    }
+
+    /**
+     * 
+     * @return the results of "CommandTimeout"
+     */
+    public int getCommandTimeout() {
+        return Dispatch.get(this, "CommandTimeout").getInt();
+    }
+
+    /**
+     * 
+     * @param plTimeout
+     *            the new "CommandTimeout"
+     */
+    public void setCommandTimeout(int plTimeout) {
+        Dispatch.put(this, "CommandTimeout", new Variant(plTimeout));
+    }
+
+    /**
+     * 
+     * @return results from "Prepared"
+     */
+    public boolean getPrepared() {
+        return Dispatch.get(this, "Prepared").getBoolean();
+    }
+
+    /**
+     * 
+     * @param pfPrepared
+     *            the new value for "Prepared"
+     */
+    public void setPrepared(boolean pfPrepared) {
+        Dispatch.put(this, "Prepared", new Variant(pfPrepared));
+    }
+
+    /**
+     * "Execute"s a command
+     * 
+     * @param RecordsAffected
+     * @param Parameters
+     * @param Options
+     * @return
+     */
+    public Recordset Execute(Variant RecordsAffected, Variant Parameters,
+            int Options) {
+        return (Recordset) Dispatch.call(this, "Execute", RecordsAffected,
+                Parameters, new Variant(Options)).toDispatch();
+    }
+
+    /**
+     * "Execute"s a command
+     * 
+     * @return
+     */
+    public Recordset Execute() {
+        Variant dummy = new Variant();
+        return new Recordset(Dispatch.call(this, "Execute", dummy).toDispatch());
+    }
+
+    /**
+     * creates a parameter
+     * 
+     * @param Name
+     * @param Type
+     * @param Direction
+     * @param Size
+     * @param Value
+     * @return
+     */
+    public Variant CreateParameter(String Name, int Type, int Direction,
+            int Size, Variant Value) {
+        return Dispatch.call(this, "CreateParameter", Name, new Variant(Type),
+                new Variant(Direction), new Variant(Size), Value);
+    }
+
+    // need to wrap Parameters
+    /**
+     * @return "Parameters"
+     */
+    public Variant getParameters() {
+        return Dispatch.get(this, "Parameters");
+    }
+
+    /**
+     * 
+     * @param plCmdType
+     *            new "CommandType"
+     */
+    public void setCommandType(int plCmdType) {
+        Dispatch.put(this, "CommandType", new Variant(plCmdType));
+    }
+
+    /**
+     * 
+     * @return current "CommandType"
+     */
+    public int getCommandType() {
+        return Dispatch.get(this, "CommandType").getInt();
+    }
+
+    /**
+     * 
+     * @return "Name"
+     */
+    public String getName() {
+        return Dispatch.get(this, "Name").toString();
+    }
+
+    /**
+     * 
+     * @param pbstrName
+     *            new "Name"
+     */
+    public void setName(String pbstrName) {
+        Dispatch.put(this, "Name", pbstrName);
+    }
+
+    /**
+     * 
+     * @return curent "State"
+     */
+    public int getState() {
+        return Dispatch.get(this, "State").getInt();
+    }
+
+    /**
+     * cancel whatever it is we're doing
+     */
+    public void Cancel() {
+        Dispatch.call(this, "Cancel");
+    }
+}

src/sample/com/jacob/samples/ado/CommandTypeEnum.java

@@ -0,0 +1,13 @@
+package com.jacob.samples.ado;
+
+// Enum: CommandTypeEnum
+
+public interface CommandTypeEnum {
+    public static final int adCmdUnspecified = -1;
+    public static final int adCmdUnknown = 8;
+    public static final int adCmdText = 1;
+    public static final int adCmdTable = 2;
+    public static final int adCmdStoredProc = 4;
+    public static final int adCmdFile = 256;
+    public static final int adCmdTableDirect = 512;
+}