Bug 530310 - 64bit support / Java environment update
diff --git a/features/org.eclipse.actf.visualization-feature/feature.xml b/features/org.eclipse.actf.visualization-feature/feature.xml
index 4cd9ef0..4074b34 100644
--- a/features/org.eclipse.actf.visualization-feature/feature.xml
+++ b/features/org.eclipse.actf.visualization-feature/feature.xml
@@ -5,7 +5,7 @@
version="1.5.1.qualifier"
provider-name="Eclipse ACTF Project"
ws="win32"
- arch="x86">
+ arch="x86_64">
<description>
%description
diff --git a/features/org.eclipse.actf.visualization.core-feature/.project b/features/org.eclipse.actf.visualization.core-feature/.project
deleted file mode 100644
index 15c1854..0000000
--- a/features/org.eclipse.actf.visualization.core-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.actf.visualization.core-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.actf.visualization.core-feature/build.properties b/features/org.eclipse.actf.visualization.core-feature/build.properties
deleted file mode 100644
index 2fb61f9..0000000
--- a/features/org.eclipse.actf.visualization.core-feature/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.actf.visualization.core-feature/epl-v10.html b/features/org.eclipse.actf.visualization.core-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.actf.visualization.core-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.actf.visualization.core-feature/feature.properties b/features/org.eclipse.actf.visualization.core-feature/feature.properties
deleted file mode 100644
index 1e6128d..0000000
--- a/features/org.eclipse.actf.visualization.core-feature/feature.properties
+++ /dev/null
@@ -1,143 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2015 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-featureName=ACTF Visualization Core Feature
-#
-description=Eclipse Accessibility Tools Framework Visualization Core Feature
-#
-copyright=Copyright (c) 2003, 2015 IBM Corporation and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nIBM Corporation - initial API and implementation\n
-licenseURL=license.html
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.actf.visualization.core-feature/feature.xml b/features/org.eclipse.actf.visualization.core-feature/feature.xml
deleted file mode 100644
index 62d19b4..0000000
--- a/features/org.eclipse.actf.visualization.core-feature/feature.xml
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.actf.visualization.core"
- label="%featureName"
- version="0.7.0.qualifier"
- provider-name="Eclipse ACTF Project"
- ws="win32"
- arch="x86">
-<!-- os="win32" can't create source feature with os attribute-->
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.swt"/>
- <import plugin="com.ibm.icu"/>
- </requires>
-
- <plugin
- id="org.eclipse.actf.ai.tts.sapi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.ai.voice"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.util.win32"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.flash.proxy"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.dom.html"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.dom.odf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.ui.editors.ie"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.ui.editors.ooo"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.engines.lowvision"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.engines.voicebrowser"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.eval"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.actf.visualization.lowvision"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.gui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.presentation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.ui.report"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.dom.dombycom"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.util.httpproxy"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.util.vocab"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.engines.blind"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.blind"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.engines.blind.html"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.blind.odfbyhtml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.blind.html"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.ui.editors.ooo.initializer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.util.win32.comclutch"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.flash"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.dom.dombycom.flash"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.mediator"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.model.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.visualization.flash"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.actf.examples.adesigner.eval.html"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.actf.examples.adesigner.eval.odf"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.actf.visualization.core-feature/license.html b/features/org.eclipse.actf.visualization.core-feature/license.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.actf.visualization.core-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.actf.visualization.sdk-feature/feature.xml b/features/org.eclipse.actf.visualization.sdk-feature/feature.xml
index c610d3d..927bc59 100644
--- a/features/org.eclipse.actf.visualization.sdk-feature/feature.xml
+++ b/features/org.eclipse.actf.visualization.sdk-feature/feature.xml
@@ -6,7 +6,7 @@
provider-name="Eclipse ACTF Project"
os="win32"
ws="win32"
- arch="x86">
+ arch="x86_64">
<description>
%description
diff --git a/features/org.eclipse.actf.visualization.ui.pdt-feature/feature.xml b/features/org.eclipse.actf.visualization.ui.pdt-feature/feature.xml
index f9df521..dffe3e9 100644
--- a/features/org.eclipse.actf.visualization.ui.pdt-feature/feature.xml
+++ b/features/org.eclipse.actf.visualization.ui.pdt-feature/feature.xml
@@ -6,7 +6,7 @@
provider-name="Eclipse ACTF Project"
os="win32"
ws="win32"
- arch="x86">
+ arch="x86_64">
<description>
%description
diff --git a/features/org.eclipse.actf.visualization.ui.wst-feature/feature.xml b/features/org.eclipse.actf.visualization.ui.wst-feature/feature.xml
index 0bc3518..8694b1c 100644
--- a/features/org.eclipse.actf.visualization.ui.wst-feature/feature.xml
+++ b/features/org.eclipse.actf.visualization.ui.wst-feature/feature.xml
@@ -6,7 +6,7 @@
provider-name="Eclipse ACTF Project"
os="win32"
ws="win32"
- arch="x86">
+ arch="x86_64">
<description>
%description
diff --git a/plugins/org.eclipse.actf.visualization.blind.html/.classpath b/plugins/org.eclipse.actf.visualization.blind.html/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.blind.html/.classpath
+++ b/plugins/org.eclipse.actf.visualization.blind.html/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.blind.html/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.blind.html/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4005c76..0000000
--- a/plugins/org.eclipse.actf.visualization.blind.html/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:34:00 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.blind.html/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.blind.html/META-INF/MANIFEST.MF
index ae304cc..f8cb605 100644
--- a/plugins/org.eclipse.actf.visualization.blind.html/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.blind.html/META-INF/MANIFEST.MF
@@ -6,4 +6,5 @@
Bundle-Vendor: Eclipse ACTF Project
Bundle-Localization: plugin
Fragment-Host: org.eclipse.actf.visualization.blind;bundle-version="0.0.1"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.blind.html
diff --git a/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/.classpath b/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/.classpath
+++ b/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e077ed5..0000000
--- a/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:34:18 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/META-INF/MANIFEST.MF
index 6af811f..be50e2b 100644
--- a/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@
Bundle-Vendor: Eclipse ACTF Project
Bundle-Localization: plugin
Fragment-Host: org.eclipse.actf.visualization.blind;bundle-version="0.0.1"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.actf.model.ui.editors.ooo,
org.eclipse.actf.model.ui.editors.ooo.initializer
+Automatic-Module-Name: org.eclipse.actf.visualization.blind.odfbyhtml
diff --git a/plugins/org.eclipse.actf.visualization.blind/.classpath b/plugins/org.eclipse.actf.visualization.blind/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.blind/.classpath
+++ b/plugins/org.eclipse.actf.visualization.blind/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.blind/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.blind/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ce2b61d..0000000
--- a/plugins/org.eclipse.actf.visualization.blind/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:33:41 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.blind/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.blind/META-INF/MANIFEST.MF
index 8924113..604fa9b 100644
--- a/plugins/org.eclipse.actf.visualization.blind/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.blind/META-INF/MANIFEST.MF
@@ -18,4 +18,5 @@
com.ibm.icu
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.actf.visualization.blind
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.blind
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/.classpath b/plugins/org.eclipse.actf.visualization.engines.blind.html/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/.classpath
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.engines.blind.html/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 77994ea..0000000
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:34:44 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.engines.blind.html/META-INF/MANIFEST.MF
index 72cc736..a662142 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/META-INF/MANIFEST.MF
@@ -19,4 +19,5 @@
org.eclipse.actf.visualization.engines.blind.html.ui.actions,
org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer,
org.eclipse.actf.visualization.engines.blind.html.util
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.engines.blind.html
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind/.classpath b/plugins/org.eclipse.actf.visualization.engines.blind/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind/.classpath
+++ b/plugins/org.eclipse.actf.visualization.engines.blind/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.engines.blind/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e38ab2d..0000000
--- a/plugins/org.eclipse.actf.visualization.engines.blind/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:34:31 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.engines.blind/META-INF/MANIFEST.MF
index 8ef9023..d2e7318 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.engines.blind/META-INF/MANIFEST.MF
@@ -18,4 +18,5 @@
Export-Package: org.eclipse.actf.visualization.engines.blind,
org.eclipse.actf.visualization.engines.blind.eval,
org.eclipse.actf.visualization.engines.blind.ui.actions
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.engines.blind
diff --git a/plugins/org.eclipse.actf.visualization.engines.lowvision/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.engines.lowvision/META-INF/MANIFEST.MF
index c520070..7bf7c77 100644
--- a/plugins/org.eclipse.actf.visualization.engines.lowvision/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.engines.lowvision/META-INF/MANIFEST.MF
@@ -15,4 +15,5 @@
Export-Package: org.eclipse.actf.visualization.engines.lowvision,
org.eclipse.actf.visualization.engines.lowvision.image
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.engines.lowvision
diff --git a/plugins/org.eclipse.actf.visualization.engines.voicebrowser/.classpath b/plugins/org.eclipse.actf.visualization.engines.voicebrowser/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.engines.voicebrowser/.classpath
+++ b/plugins/org.eclipse.actf.visualization.engines.voicebrowser/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.engines.voicebrowser/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.engines.voicebrowser/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 934c86f..0000000
--- a/plugins/org.eclipse.actf.visualization.engines.voicebrowser/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:35:06 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.engines.voicebrowser/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.engines.voicebrowser/META-INF/MANIFEST.MF
index 4ee8124..576e0f7 100644
--- a/plugins/org.eclipse.actf.visualization.engines.voicebrowser/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.engines.voicebrowser/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@
org.eclipse.core.runtime,
org.eclipse.actf.ai.voice
Export-Package: org.eclipse.actf.visualization.engines.voicebrowser
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.engines.voicebrowser
diff --git a/plugins/org.eclipse.actf.visualization.eval/.classpath b/plugins/org.eclipse.actf.visualization.eval/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.eval/.classpath
+++ b/plugins/org.eclipse.actf.visualization.eval/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.eval/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.eval/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1321e42..0000000
--- a/plugins/org.eclipse.actf.visualization.eval/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:35:22 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.eval/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.eval/META-INF/MANIFEST.MF
index 6e68367..7fa9ce1 100644
--- a/plugins/org.eclipse.actf.visualization.eval/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.eval/META-INF/MANIFEST.MF
@@ -17,4 +17,5 @@
org.eclipse.actf.visualization.eval.html,
org.eclipse.actf.visualization.eval.html.statistics,
org.eclipse.actf.visualization.eval.problem
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.eval
diff --git a/plugins/org.eclipse.actf.visualization.flash/.classpath b/plugins/org.eclipse.actf.visualization.flash/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.flash/.classpath
+++ b/plugins/org.eclipse.actf.visualization.flash/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.flash/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.flash/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e361fe0..0000000
--- a/plugins/org.eclipse.actf.visualization.flash/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:35:33 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.flash/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.flash/META-INF/MANIFEST.MF
index a55277e..9cb98eb 100644
--- a/plugins/org.eclipse.actf.visualization.flash/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.flash/META-INF/MANIFEST.MF
@@ -16,4 +16,5 @@
org.eclipse.actf.util.win32.comclutch,
com.ibm.icu
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.flash
diff --git a/plugins/org.eclipse.actf.visualization.gui/.classpath b/plugins/org.eclipse.actf.visualization.gui/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.gui/.classpath
+++ b/plugins/org.eclipse.actf.visualization.gui/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.gui/AccessibilityJavaMsaaLibrary.dll b/plugins/org.eclipse.actf.visualization.gui/AccessibilityJavaMsaaLibrary.dll
index bc281cd..8a009a2 100644
--- a/plugins/org.eclipse.actf.visualization.gui/AccessibilityJavaMsaaLibrary.dll
+++ b/plugins/org.eclipse.actf.visualization.gui/AccessibilityJavaMsaaLibrary.dll
Binary files differ
diff --git a/plugins/org.eclipse.actf.visualization.gui/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.gui/META-INF/MANIFEST.MF
index cad4151..b07f264 100644
--- a/plugins/org.eclipse.actf.visualization.gui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.gui/META-INF/MANIFEST.MF
@@ -12,11 +12,11 @@
org.eclipse.actf.core,
org.eclipse.actf.ai.voice,
org.eclipse.actf.model.ui,
- org.eclipse.actf.model.flash,
org.eclipse.actf.util.win32,
org.eclipse.actf.ui,
org.eclipse.actf.visualization,
com.ibm.icu
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.actf.visualization.gui
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.gui
diff --git a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.sln b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.sln
index e62f7ae..ab8fd8f 100644
--- a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.sln
+++ b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.sln
@@ -1,20 +1,31 @@

-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AccessibilityJavaMsaaLibrary", "AccessibilityJavaMsaaLibrary.vcproj", "{F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.10
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AccessibilityJavaMsaaLibrary", "AccessibilityJavaMsaaLibrary.vcxproj", "{F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}.Debug|Win32.ActiveCfg = Debug|Win32
{F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}.Debug|Win32.Build.0 = Debug|Win32
+ {F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}.Debug|x64.ActiveCfg = Debug|x64
+ {F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}.Debug|x64.Build.0 = Debug|x64
{F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}.Release|Win32.ActiveCfg = Release|Win32
{F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}.Release|Win32.Build.0 = Release|Win32
+ {F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}.Release|x64.ActiveCfg = Release|x64
+ {F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {4D1A8B51-9CDA-4BB4-ACBD-40F0224353B8}
+ EndGlobalSection
EndGlobal
diff --git a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.vcproj b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.vcproj
deleted file mode 100644
index 60b1bfd..0000000
--- a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.vcproj
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="AccessibilityJavaMsaaLibrary"
- ProjectGUID="{F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}"
- RootNamespace="AccessibilityJavaMsaaLibrary"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ACCESSIBILITYJAVAMSAALIBRARY_EXPORTS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="oleacc.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ACCESSIBILITYJAVAMSAALIBRARY_EXPORTS"
- RuntimeLibrary="0"
- UsePrecompiledHeader="2"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="oleacc.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\AccessibilityJavaMsaaLibrary.cpp"
- >
- </File>
- <File
- RelativePath=".\org_eclipse_actf_accservice_swtbridge_MSAA.cpp"
- >
- </File>
- <File
- RelativePath=".\stdafx.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\stdafx.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- <File
- RelativePath=".\ReadMe.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.vcxproj b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.vcxproj
new file mode 100644
index 0000000..65484a3
--- /dev/null
+++ b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/AccessibilityJavaMsaaLibrary.vcxproj
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{F8B67A86-F2D8-4AC2-B9FE-EB4ADB80B02D}</ProjectGuid>
+ <RootNamespace>AccessibilityJavaMsaaLibrary</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>15.0.26730.3</_ProjectFileVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+ <IntDir>$(Configuration)\</IntDir>
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+ <IntDir>$(Configuration)\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ACCESSIBILITYJAVAMSAALIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>oleacc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ACCESSIBILITYJAVAMSAALIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>oleacc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ACCESSIBILITYJAVAMSAALIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>oleacc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ACCESSIBILITYJAVAMSAALIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>oleacc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="AccessibilityJavaMsaaLibrary.cpp" />
+ <ClCompile Include="org_eclipse_actf_accservice_swtbridge_MSAA.cpp" />
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="stdafx.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <Text Include="ReadMe.txt" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/org_eclipse_actf_accservice_swtbridge_MSAA.cpp b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/org_eclipse_actf_accservice_swtbridge_MSAA.cpp
index 43c88aa..e83846a 100644
--- a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/org_eclipse_actf_accservice_swtbridge_MSAA.cpp
+++ b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/org_eclipse_actf_accservice_swtbridge_MSAA.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
+ * Copyright (c) 2007, 2019 IBM Corporation and Others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,30 +11,30 @@
#include "stdafx.h"
#include "org_eclipse_actf_accservice_swtbridge_MSAA.h"
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromPoint
- (JNIEnv *env, jclass that, jint x, jint y, jint pvarChild)
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromPoint
+ (JNIEnv *env, jclass that, jint x, jint y, jintLong pvarChild)
{
IAccessible *pAcc = NULL;
POINT ptScreen = {x,y};
if( FAILED( AccessibleObjectFromPoint(ptScreen,&pAcc,(VARIANT*)pvarChild) ) ) {
return NULL;
}
- return (jint)pAcc;
+ return (jintLong)pAcc;
}
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromWindow
- (JNIEnv *env, jclass that, jint hwnd)
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromWindow
+ (JNIEnv *env, jclass that, jintLong hwnd)
{
void *pObject = NULL;
// if( FAILED( AccessibleObjectFromWindow((HWND)hwnd,OBJID_CLIENT,IID_IAccessible,&pObject) ) ) {
if( FAILED( AccessibleObjectFromWindow((HWND)hwnd,OBJID_WINDOW,IID_IAccessible,&pObject) ) ) {
return NULL;
}
- return (jint)pObject;
+ return (jintLong)pObject;
}
JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleChildren
- (JNIEnv *env, jclass that, jint paccContainer, jint iChildStart, jint cChildren, jint rgvarChildren)
+ (JNIEnv *env, jclass that, jintLong paccContainer, jint iChildStart, jint cChildren, jintLong rgvarChildren)
{
LONG count = 0;
if( FAILED( AccessibleChildren((IAccessible*)paccContainer,iChildStart,cChildren,(VARIANT*)rgvarChildren,&count) ) ) {
@@ -43,14 +43,14 @@
return (jint)count;
}
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_WindowFromAccessibleObject
- (JNIEnv *env, jclass that, jint pAcc)
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_WindowFromAccessibleObject
+ (JNIEnv *env, jclass that, jintLong pAcc)
{
HWND hwnd = NULL;
if( FAILED(WindowFromAccessibleObject((IAccessible*)pAcc,&hwnd)) ) {
return NULL;
}
- return (jint)hwnd;
+ return (jintLong)hwnd;
}
JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_GetRoleText
@@ -83,42 +83,42 @@
return count;
}
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromEvent
- (JNIEnv *env, jclass that, jint hwnd, jint dwId, jint dwChildId, jint pvarChild)
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromEvent
+ (JNIEnv *env, jclass that, jintLong hwnd, jint dwId, jint dwChildId, jintLong pvarChild)
{
IAccessible *pAcc = NULL;
if( FAILED( AccessibleObjectFromEvent((HWND)hwnd, dwId, dwChildId, &pAcc, (VARIANT*)pvarChild) ) ) {
return NULL;
}
- return (jint)pAcc;
+ return (jintLong)pAcc;
}
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_SetWinEventHook
- (JNIEnv *env, jclass that, jint eventMin, jint eventMax, jint hmodWinEventProc, jint lpfnWinEventProc, jint idProcess,jint idThread,jint dwFlags)
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_SetWinEventHook
+ (JNIEnv *env, jclass that, jint eventMin, jint eventMax, jintLong hmodWinEventProc, jintLong lpfnWinEventProc, jint idProcess,jint idThread,jint dwFlags)
{
- jint rc = 0;
- rc = (jint)SetWinEventHook(eventMin, eventMax, (HMODULE)hmodWinEventProc, (WINEVENTPROC)lpfnWinEventProc, idProcess, idThread, dwFlags);
+ jintLong rc = 0;
+ rc = (jintLong)SetWinEventHook(eventMin, eventMax, (HMODULE)hmodWinEventProc, (WINEVENTPROC)lpfnWinEventProc, idProcess, idThread, dwFlags);
return rc;
}
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_UnhookWinEvent
- (JNIEnv *env, jclass that, jint hEvent)
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_UnhookWinEvent
+ (JNIEnv *env, jclass that, jintLong hEvent)
{
- return (jint)UnhookWinEvent((HWINEVENTHOOK)hEvent);
+ return (jintLong)UnhookWinEvent((HWINEVENTHOOK)hEvent);
}
static UINT MSG_GETOBJECT = RegisterWindowMessage(TEXT("WM_HTML_GETOBJECT"));
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_HTMLDocumentFromWindow
- (JNIEnv *env, jclass that, jint hwnd)
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_HTMLDocumentFromWindow
+ (JNIEnv *env, jclass that, jintLong hwnd)
{
void *pObject = NULL;
LRESULT lRes = NULL;
- SendMessageTimeout((HWND)hwnd, MSG_GETOBJECT, 0L, 0L, SMTO_ABORTIFHUNG, 1000, (DWORD*)&lRes );
+ SendMessageTimeout((HWND)hwnd, MSG_GETOBJECT, 0L, 0L, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&lRes );
if( lRes==NULL || FAILED( ObjectFromLresult(lRes, IID_IHTMLDocument, 0, &pObject) ) ) {
return NULL;
}
- return (jint)pObject;
+ return (jintLong)pObject;
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/org_eclipse_actf_accservice_swtbridge_MSAA.h b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/org_eclipse_actf_accservice_swtbridge_MSAA.h
index 488fa4e..ab3c3e0 100644
--- a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/org_eclipse_actf_accservice_swtbridge_MSAA.h
+++ b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/org_eclipse_actf_accservice_swtbridge_MSAA.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
+ * Copyright (c) 2007, 2019 IBM Corporation and Others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -180,16 +180,16 @@
* Method: AccessibleObjectFromPoint
* Signature: (III)I
*/
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromPoint
- (JNIEnv *, jclass, jint, jint, jint);
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromPoint
+ (JNIEnv *, jclass, jint, jint, jintLong);
/*
* Class: org_eclipse_actf_accservice_swtbridge_MSAA
* Method: AccessibleObjectFromWindow
* Signature: (I)I
*/
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromWindow
- (JNIEnv *, jclass, jint);
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromWindow
+ (JNIEnv *, jclass, jintLong);
/*
* Class: org_eclipse_actf_accservice_swtbridge_MSAA
@@ -197,15 +197,15 @@
* Signature: (IIII)I
*/
JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleChildren
- (JNIEnv *, jclass, jint, jint, jint, jint);
+ (JNIEnv *, jclass, jintLong, jint, jint, jintLong);
/*
* Class: org_eclipse_actf_accservice_swtbridge_MSAA
* Method: WindowFromAccessibleObject
* Signature: (I)I
*/
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_WindowFromAccessibleObject
- (JNIEnv *, jclass, jint);
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_WindowFromAccessibleObject
+ (JNIEnv *, jclass, jintLong);
/*
* Class: org_eclipse_actf_accservice_swtbridge_MSAA
@@ -228,32 +228,32 @@
* Method: AccessibleObjectFromEvent
* Signature: (IIII)I
*/
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromEvent
- (JNIEnv *, jclass, jint, jint, jint, jint);
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_AccessibleObjectFromEvent
+ (JNIEnv *, jclass, jintLong, jint, jint, jintLong);
/*
* Class: org_eclipse_actf_accservice_swtbridge_MSAA
* Method: SetWinEventHook
* Signature: (IIIIIII)I
*/
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_SetWinEventHook
- (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jint);
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_SetWinEventHook
+ (JNIEnv *, jclass, jint, jint, jintLong, jintLong, jint, jint, jint);
/*
* Class: org_eclipse_actf_accservice_swtbridge_MSAA
* Method: UnhookWinEvent
* Signature: (I)I
*/
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_UnhookWinEvent
- (JNIEnv *, jclass, jint);
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_UnhookWinEvent
+ (JNIEnv *, jclass, jintLong);
/*
* Class: org_eclipse_actf_accservice_swtbridge_MSAA
* Method: HTMLDocumentFromWindow
* Signature: (I)I
*/
-JNIEXPORT jint JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_HTMLDocumentFromWindow
- (JNIEnv *, jclass, jint);
+JNIEXPORT jintLong JNICALL Java_org_eclipse_actf_accservice_swtbridge_MSAA_HTMLDocumentFromWindow
+ (JNIEnv *, jclass, jintLong);
#ifdef __cplusplus
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/stdafx.h b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/stdafx.h
index e35c0dd..a8740fe 100644
--- a/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/stdafx.h
+++ b/plugins/org.eclipse.actf.visualization.gui/library_src/AccessibilityJavaMsaaLibrary/stdafx.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
+ * Copyright (c) 2007, 2019 IBM Corporation and Others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,3 +40,8 @@
// TODO: reference additional headers your program requires here
#include <oleacc.h>
#include <mshtml.h>
+#ifndef _WIN64
+#define jintLong jint
+#else
+#define jintLong jlong
+#endif
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObject.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObject.java
index 5b55c36..097ea8a 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObject.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObject.java
@@ -72,7 +72,7 @@
*
* @return window handle
*/
- public int getWindow();
+ public long getWindow();
/**
* Get accRole value
@@ -287,5 +287,5 @@
*/
public String getRealRoleText();
- public int getPtr();
+ public long getPtr();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObjectFactory.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObjectFactory.java
index f29fd63..dec91a3 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObjectFactory.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObjectFactory.java
@@ -41,14 +41,14 @@
return null;
}
- public static AccessibleObject getAccessibleObjectFromWindow(int hwnd) {
+ public static AccessibleObject getAccessibleObjectFromWindow(long hwnd) {
if (null != currentFactory) {
return currentFactory.getAccessibleObjectFromWindow(hwnd);
}
return null;
}
- public static AccessibleObject getAccessibleObjectFromEvent(int hwnd,
+ public static AccessibleObject getAccessibleObjectFromEvent(long hwnd,
int dwId, int dwChildId) {
if (null != currentFactory) {
return currentFactory.getAccessibleObjectFromEvent(hwnd, dwId,
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IAccessible.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IAccessible.java
index 21f4d25..d3a7f29 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IAccessible.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IAccessible.java
@@ -11,55 +11,93 @@
package org.eclipse.actf.accservice.swtbridge;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.actf.util.win32.NativeVariantAccess;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IDispatch;
+import org.eclipse.swt.ole.win32.OLE;
+import org.eclipse.swt.ole.win32.Variant;
public class IAccessible extends IDispatch {
public static final GUID IID = COMUtil.IIDFromString("{618736E0-3C3D-11CF-810C-00AA00389B71}"); //$NON-NLS-1$
- int address;
- public IAccessible(int address) {
+ long address;
+ public IAccessible(long address) {
super(address);
this.address = address;
}
- public int getAddress() {
+ public long getAddress() {
return address;
}
- public int get_accParent(int ppdispParent) {
- return COMUtil.VtblCall(7, address, ppdispParent);
+ public int get_accParent(long ppdispParent) {
+ return COM.VtblCall(7, address, ppdispParent);
}
- public int get_accChildCount(int pcountChildren) {
- return COMUtil.VtblCall(8, address, pcountChildren);
+ public int get_accChildCount(long pcountChildren) {
+ return COM.VtblCall(8, address, pcountChildren);
}
- public int get_accChild(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int ppdispChild) {
- return COMUtil.VtblCall(9, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, ppdispChild);
+// public int get_accChild(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long ppdispChild) {
+// return COM.VtblCall(9, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, ppdispChild);
+// }
+ public int get_accChild(Variant varChild, long ppdispChild) {
+ return callVariantP(varChild, 9, ppdispChild);
}
- public int get_accName(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszName) {
- return COMUtil.VtblCall(10, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszName);
+// public int get_accName(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long pszName) {
+// return COM.VtblCall(10, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszName);
+// }
+ public int get_accName(Variant varChild, long pszName) {
+ return callVariantP(varChild, 10, pszName);
}
- public int get_accValue(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszValue) {
- return COMUtil.VtblCall(11, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszValue);
+// public int get_accValue(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long pszValue) {
+// return COM.VtblCall(11, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszValue);
+// }
+ public int get_accValue(Variant varChild, long pszValue) {
+ return callVariantP(varChild, 11, pszValue);
}
- public int get_accDescription(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszDescription) {
- return COMUtil.VtblCall(12, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszDescription);
+// public int get_accDescription(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long pszDescription) {
+// return COM.VtblCall(12, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszDescription);
+// }
+ public int get_accDescription(Variant varChild, long pszDescription) {
+ return callVariantP(varChild, 12, pszDescription);
}
- public int get_accRole(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pvarRole) {
- return COMUtil.VtblCall(13, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pvarRole);
+// public int get_accRole(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long pvarRole) {
+// return COM.VtblCall(13, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pvarRole);
+// }
+ public int get_accRole(Variant varChild, long pvarRole) {
+ return callVariantP(varChild, 13, pvarRole);
}
- public int get_accState(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pvarState) {
- return COMUtil.VtblCall(14, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pvarState);
+// public int get_accState(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long pvarState) {
+// return COM.VtblCall(14, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pvarState);
+// }
+ public int get_accState(Variant varChild, long pvarState) {
+ return callVariantP(varChild, 14, pvarState);
}
- public int get_accHelp(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszHelp) {
- return COMUtil.VtblCall(15, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszHelp);
+// public int get_accHelp(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long pszHelp) {
+// return COM.VtblCall(15, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszHelp);
+// }
+ public int get_accHelp(Variant varChild, long pszHelp) {
+ return callVariantP(varChild, 15, pszHelp);
}
- public int get_accHelpTopic(int pszHelpFile, int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pidTopic) {
- return COMUtil.VtblCall(16, address, pszHelpFile, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pidTopic);
+// public int get_accHelpTopic(long pszHelpFile, int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long pidTopic) {
+// return COM.VtblCall(16, address, pszHelpFile, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pidTopic);
+// }
+ public int get_accHelpTopic(long pszHelpFile, Variant varChild, long pidTopic) {
+ NativeVariantAccess nva = new NativeVariantAccess();
+ nva.setVariant(varChild);
+ try {
+ return COM.VtblCall_PVARIANTP(16, address, pszHelpFile, nva.getAddress(), pidTopic);
+ }
+ finally {
+ nva.dispose();
+ }
}
- public int get_accKeyboardShortcut(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszKeyboardShortcut) {
- return COMUtil.VtblCall(17, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszKeyboardShortcut);
+// public int get_accKeyboardShortcut(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long pszKeyboardShortcut) {
+// return COM.VtblCall(17, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszKeyboardShortcut);
+// }
+ public int get_accKeyboardShortcut(Variant varChild, long pszKeyboardShortcut) {
+ return callVariantP(varChild, 17, pszKeyboardShortcut);
}
public int get_accFocus(int pvarChild) {
return COMUtil.VtblCall(18, address, pvarChild);
@@ -67,15 +105,38 @@
public int get_accSelection(int pvarChildren) {
return COMUtil.VtblCall(19, address, pvarChildren);
}
- public int get_accDefaultAction(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszDefaultAction) {
- return COMUtil.VtblCall(20, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszDefaultAction);
+// public int get_accDefaultAction(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long pszDefaultAction) {
+// return COM.VtblCall(20, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszDefaultAction);
+// }
+ public int get_accDefaultAction(Variant varChild, long pszDefaultAction) {
+ return callVariantP(varChild, 20, pszDefaultAction);
}
- public int accSelect(int flagsSelect, int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2) {
- return COMUtil.VtblCall(21, address, flagsSelect, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2);
+// public int accSelect(int flagsSelect, int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2) {
+// return COMUtil.VtblCall(21, address, flagsSelect, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2);
+// }
+ public int accSelect(int flagsSelect, Variant varChild) {
+ NativeVariantAccess nva = new NativeVariantAccess();
+ nva.setVariant(varChild);
+ try {
+ return COM.VtblCall_IVARIANT(21, address, flagsSelect, nva.getAddress());
+ }
+ finally {
+ nva.dispose();
+ }
}
- public int accLocation(int pxLeft, int pyTop, int pcxWidth, int pcyHeight,
- int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2) {
- return COMUtil.VtblCall(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2);
+// public int accLocation(long pxLeft, long pyTop, long pcxWidth, long pcyHeight,
+// int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2) {
+// return COM.VtblCall(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2);
+// }
+ public int accLocation(long pxLeft, long pyTop, long pcxWidth, long pcyHeight, Variant varChild) {
+ NativeVariantAccess nva = new NativeVariantAccess();
+ nva.setVariant(varChild);
+ try {
+ return COM.VtblCall_PPPPVARIANT(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, nva.getAddress());
+ }
+ finally {
+ nva.dispose();
+ }
}
public int accNavigate(int navDir, int varStart_vt, int varStart_reserved1, int varStart_lVal, int varStart_reserved2, int pvarEndUpAt) {
return COMUtil.VtblCall(23, address, navDir, varStart_vt, varStart_reserved1, varStart_lVal, varStart_reserved2, pvarEndUpAt);
@@ -83,14 +144,40 @@
public int accHitTest(int xLeft, int yTop, int pvarChild) {
return COMUtil.VtblCall(24, address, xLeft, yTop, pvarChild);
}
- public int accDoDefaultAction(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2) {
- return COMUtil.VtblCall(25, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2);
+// public int accDoDefaultAction(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2) {
+// return COMUtil.VtblCall(25, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2);
+// }
+ public int accDoDefaultAction(Variant varChild) {
+ NativeVariantAccess nva = new NativeVariantAccess();
+ nva.setVariant(varChild);
+ try {
+ return COM.VtblCall_VARIANT(25, address, nva.getAddress());
+ }
+ finally {
+ nva.dispose();
+ }
}
- public int put_accName(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int szName) {
- return COMUtil.VtblCall(26, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, szName);
+// public int put_accName(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long szName) {
+// return COM.VtblCall(26, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, szName);
+// }
+ public int put_accName(Variant varChild, long szName) {
+ return callVariantP(varChild, 26, szName);
}
- public int put_accValue(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int szValue) {
- return COMUtil.VtblCall(27, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, szValue);
+// public int put_accValue(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, long szValue) {
+// return COM.VtblCall(27, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, szValue);
+// }
+ public int put_accValue(Variant varChild, long szValue) {
+ return callVariantP(varChild, 27, szValue);
}
-
+
+ private int callVariantP(Variant varIn, int fn, long pVarOut) {
+ NativeVariantAccess nva = new NativeVariantAccess();
+ nva.setVariant(varIn);
+ try {
+ return COM.VtblCall_VARIANTP(fn, address, nva.getAddress(), pVarOut);
+ }
+ finally {
+ nva.dispose();
+ }
+ }
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IAccessibleObjectFactory.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IAccessibleObjectFactory.java
index 6c93afd..90ec937 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IAccessibleObjectFactory.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IAccessibleObjectFactory.java
@@ -18,9 +18,9 @@
public AccessibleObject getAccessibleObjectFromPoint(Point point);
- public AccessibleObject getAccessibleObjectFromWindow(int hwnd);
+ public AccessibleObject getAccessibleObjectFromWindow(long hwnd);
- public AccessibleObject getAccessibleObjectFromEvent(int hwnd, int dwId, int dwChildId);
+ public AccessibleObject getAccessibleObjectFromEvent(long hwnd, int dwId, int dwChildId);
public IAccessibleEventMonitor getAccessibleEventMonitor();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IServiceProvider.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IServiceProvider.java
index 37e53e6..4a430b4 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IServiceProvider.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/IServiceProvider.java
@@ -23,17 +23,17 @@
public class IServiceProvider extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{6d5140c1-7436-11ce-8034-00aa006009fa}"); //$NON-NLS-1$
- public IServiceProvider(int address) {
+ public IServiceProvider(long address) {
super(address);
}
- public int QueryService(int pGuidService, int pRiid, int ppvObject[]) {
+ public int QueryService(long pGuidService, long pRiid, long ppvObject[]) {
return COM.VtblCall(3, getAddress(), pGuidService, pRiid, ppvObject);
}
- public int QueryService(GUID guidService, GUID riid, int ppvObject[]) {
- int pGuidService = MemoryUtil.GlobalAlloc(GUID.sizeof);
- int pRiid = MemoryUtil.GlobalAlloc(GUID.sizeof);
+ public int QueryService(GUID guidService, GUID riid, long ppvObject[]) {
+ long pGuidService = MemoryUtil.GlobalAlloc(GUID.sizeof);
+ long pRiid = MemoryUtil.GlobalAlloc(GUID.sizeof);
try {
COM.MoveMemory(pGuidService, guidService, GUID.sizeof);
COM.MoveMemory(pRiid, riid, GUID.sizeof);
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/MSAA.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/MSAA.java
index 847d90b..4fa5751 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/MSAA.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/MSAA.java
@@ -192,10 +192,10 @@
SELFLAG_ADDSELECTION = 8, // Adds the object to the current selection.
SELFLAG_REMOVESELECTION = 16; // Removes the object from the current selection.
- public static int getAccessibleObjectFromPoint(Point point, int[] pChild) {
+ public static long getAccessibleObjectFromPoint(Point point, int[] pChild) {
NativeVariantAccess nva = new NativeVariantAccess();
try {
- int pvObject = AccessibleObjectFromPoint(point.x,point.y,nva.getAddress());
+ long pvObject = AccessibleObjectFromPoint(point.x,point.y,nva.getAddress());
if( OLE.VT_I4 == nva.getType() ) {
pChild[0] = nva.getInt();
}
@@ -206,10 +206,10 @@
}
}
- public static int getAccessibleObjectFromEvent(int hwnd, int dwId, int dwChildId, int[] pChild) {
+ public static long getAccessibleObjectFromEvent(long hwnd, int dwId, int dwChildId, int[] pChild) {
NativeVariantAccess nva = new NativeVariantAccess();
try {
- int pvObject = AccessibleObjectFromEvent(hwnd, dwId, dwChildId, nva.getAddress());
+ long pvObject = AccessibleObjectFromEvent(hwnd, dwId, dwChildId, nva.getAddress());
if( OLE.VT_I4 == nva.getType() ) {
pChild[0] = nva.getInt();
}
@@ -220,7 +220,7 @@
}
}
- public static void getAccessibleChildren(int address, Variant[] pVarResult) {
+ public static void getAccessibleChildren(long address, Variant[] pVarResult) {
int resultLength = pVarResult.length;
NativeVariantAccess nva = new NativeVariantAccess(resultLength);
try {
@@ -243,7 +243,7 @@
}
}
- public static int getWindowFromAccessibleObject(int address) {
+ public static long getWindowFromAccessibleObject(long address) {
return WindowFromAccessibleObject(address);
}
@@ -268,19 +268,19 @@
}
/** Accessibility natives */
- public static final native int AccessibleObjectFromPoint(int x, int y, int pvarChild);
- public static final native int AccessibleObjectFromWindow(int hwnd);
- public static final native int AccessibleChildren(int paccContainer, int iChildStart, int cChildren, int rgvarChildren);
- public static final native int WindowFromAccessibleObject(int pAcc);
+ public static final native long AccessibleObjectFromPoint(int x, int y, long pvarChild);
+ public static final native long AccessibleObjectFromWindow(long hwnd);
+ public static final native int AccessibleChildren(long paccContainer, int iChildStart, int cChildren, long rgvarChildren);
+ public static final native long WindowFromAccessibleObject(long pAcc);
public static final native int GetRoleText(int lRole, char[] lpszRole, int cchRoleMax);
public static final native int GetStateText(int lStateBit, char[] lpszState, int cchState);
- public static final native int AccessibleObjectFromEvent(int hwnd, int dwId, int dwChildId, int pvarChild);
- public static final native int SetWinEventHook(int eventMin, int eventMax, int hmodWinEventProc, int lpfnWinEventProc, int idProcess,int idThread,int dwFlags);
- public static final native int UnhookWinEvent(int hEvent);
+ public static final native long AccessibleObjectFromEvent(long hwnd, int dwId, int dwChildId, long pvarChild);
+ public static final native long SetWinEventHook(int eventMin, int eventMax, long hmodWinEventProc, long lpfnWinEventProc, int idProcess,int idThread,int dwFlags);
+ public static final native long UnhookWinEvent(long hEvent);
/** */
- public static final native int HTMLDocumentFromWindow(int hwnd);
+ public static final native long HTMLDocumentFromWindow(long hwnd);
/** SPI Support **/
private final static int SPI_GETSCREENREADER = 70;
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/event/IAccessibleEventListener.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/event/IAccessibleEventListener.java
index 093b398..91cec8b 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/event/IAccessibleEventListener.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/event/IAccessibleEventListener.java
@@ -14,6 +14,6 @@
public interface IAccessibleEventListener {
- public void handleEvent(int event, int hwnd, int idObject, int idChild, AccessibleObject accObject);
+ public void handleEvent(int event, long hwnd, int idObject, int idChild, AccessibleObject accObject);
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalAccessibleObject.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalAccessibleObject.java
index 23dad44..edec533 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalAccessibleObject.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalAccessibleObject.java
@@ -89,11 +89,11 @@
private int accRole;
private int ia1Role, ia2Role;
- private int accWindow;
+ private long accWindow;
private String strClassName;
private static final String STR_NULL = null;// "";
- private InternalAccessibleObject(int address) {
+ private InternalAccessibleObject(long address) {
this((InternalAccessibleObject) null, new Variant(
new IDispatch(address)));
}
@@ -109,8 +109,8 @@
break;
}
case OLE.VT_DISPATCH:
- int[] ppvObject = new int[1];
- int[] ppvServiceProvider = new int[1];
+ long[] ppvObject = new long[1];
+ long[] ppvServiceProvider = new long[1];
if (OLE.S_OK == varChild.getDispatch().QueryInterface(
IServiceProvider.IID, ppvServiceProvider)) {
IServiceProvider sp = new IServiceProvider(
@@ -202,8 +202,11 @@
disposeChildren();
NativeVariantAccess nva = new NativeVariantAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accRole(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nva.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accRole(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nva.getAddress())) {
+// accRole = nva.getInt();
+// }
+ if (OLE.S_OK == getIAccessible().get_accRole(varChildIndex, nva.getAddress())) {
accRole = nva.getInt();
}
} finally {
@@ -297,31 +300,31 @@
public static AccessibleObject getAccessibleObjectFromPoint(Point point) {
int[] pChild = new int[1];
- int address = MSAA.getAccessibleObjectFromPoint(point, pChild);
+ long address = MSAA.getAccessibleObjectFromPoint(point, pChild);
return newInstance(address, pChild[0]);
}
- public static AccessibleObject getAccessibleObjectFromWindow(int hwnd) {
- int address = MSAA.AccessibleObjectFromWindow(hwnd);
+ public static AccessibleObject getAccessibleObjectFromWindow(long hwnd) {
+ long address = MSAA.AccessibleObjectFromWindow(hwnd);
return newInstance(address);
}
- public static AccessibleObject getAccessibleObjectFromEvent(int hwnd,
+ public static AccessibleObject getAccessibleObjectFromEvent(long hwnd,
int dwId, int dwChildId) {
int[] pChild = new int[1];
- int address = MSAA.getAccessibleObjectFromEvent(hwnd, dwId, dwChildId,
+ long address = MSAA.getAccessibleObjectFromEvent(hwnd, dwId, dwChildId,
pChild);
return newInstance(address, pChild[0]);
}
- public static AccessibleObject newInstance(int address) {
+ public static AccessibleObject newInstance(long address) {
if (0 == address) {
return null;
}
return new InternalAccessibleObject(address);
}
- private static AccessibleObject newInstance(int address, int childId) {
+ private static AccessibleObject newInstance(long address, int childId) {
AccessibleObject accObject = newInstance(address);
if ((null != accObject) && (MSAA.CHILDID_SELF != childId)) {
return ((InternalAccessibleObject) accObject)
@@ -426,7 +429,7 @@
*
* @see org.eclipse.actf.accservice.swtbridge.AccessibleObject#getWindow()
*/
- public int getWindow() {
+ public long getWindow() {
if (-1 == accWindow) {
try {
accWindow = MSAA.WindowFromAccessibleObject(getIAccessible()
@@ -456,8 +459,11 @@
if (-1 == accRole) {
NativeVariantAccess nva = new NativeVariantAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accRole(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nva.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accRole(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nva.getAddress())) {
+// return nva.getString();
+// }
+ if (OLE.S_OK == getIAccessible().get_accRole(varChildIndex, nva.getAddress())) {
return nva.getString();
}
} finally {
@@ -476,7 +482,7 @@
*/
public String getClassName() {
if (null == strClassName) {
- int hwnd = this.getWindow();
+ long hwnd = this.getWindow();
strClassName = STR_NULL;
if (0 != hwnd) {
strClassName = WindowUtil.GetWindowClassName(hwnd);
@@ -493,8 +499,11 @@
public int getAccState() {
NativeVariantAccess nva = new NativeVariantAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accState(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nva.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accState(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nva.getAddress())) {
+// return nva.getInt();
+// }
+ if (OLE.S_OK == getIAccessible().get_accState(varChildIndex, nva.getAddress())) {
return nva.getInt();
}
} catch (Exception e) {
@@ -512,8 +521,11 @@
public String getAccName() {
NativeStringAccess nsa = new NativeStringAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accName(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nsa.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accName(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nsa.getAddress())) {
+// return nsa.getString();
+// }
+ if (OLE.S_OK == getIAccessible().get_accName(varChildIndex, nsa.getAddress())) {
return nsa.getString();
}
} catch (Exception e) {
@@ -531,8 +543,11 @@
public String getAccValue() {
NativeStringAccess nsa = new NativeStringAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accValue(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nsa.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accValue(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nsa.getAddress())) {
+// return nsa.getString();
+// }
+ if (OLE.S_OK == getIAccessible().get_accValue(varChildIndex, nsa.getAddress())) {
return nsa.getString();
}
} catch (Exception e) {
@@ -550,8 +565,11 @@
public String getAccDescription() {
NativeStringAccess nsa = new NativeStringAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accDescription(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nsa.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accDescription(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nsa.getAddress())) {
+// return nsa.getString();
+// }
+ if (OLE.S_OK == getIAccessible().get_accDescription(varChildIndex, nsa.getAddress())) {
return nsa.getString();
}
} catch (Exception e) {
@@ -569,8 +587,11 @@
public String getAccHelp() {
NativeStringAccess nsa = new NativeStringAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accHelp(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nsa.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accHelp(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nsa.getAddress())) {
+// return nsa.getString();
+// }
+ if (OLE.S_OK == getIAccessible().get_accHelp(varChildIndex, nsa.getAddress())) {
return nsa.getString();
}
} catch (Exception e) {
@@ -588,8 +609,11 @@
public String getAccKeyboardShortcut() {
NativeStringAccess nsa = new NativeStringAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accKeyboardShortcut(OLE.VT_I4,
- 0, varChildIndex.getInt(), 0, nsa.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accKeyboardShortcut(OLE.VT_I4,
+// 0, varChildIndex.getInt(), 0, nsa.getAddress())) {
+// return nsa.getString();
+// }
+ if (OLE.S_OK == getIAccessible().get_accKeyboardShortcut(varChildIndex, nsa.getAddress())) {
return nsa.getString();
}
} catch (Exception e) {
@@ -607,8 +631,11 @@
public String getAccDefaultAction() {
NativeStringAccess nsa = new NativeStringAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accDefaultAction(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nsa.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accDefaultAction(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nsa.getAddress())) {
+// return nsa.getString();
+// }
+ if (OLE.S_OK == getIAccessible().get_accDefaultAction(varChildIndex, nsa.getAddress())) {
return nsa.getString();
}
} catch (Exception e) {
@@ -628,8 +655,13 @@
NativeStringAccess nsa = new NativeStringAccess();
NativeIntAccess nia = new NativeIntAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accHelpTopic(nsa.getAddress(),
- OLE.VT_I4, 0, varChildIndex.getInt(), 0, nia.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accHelpTopic(nsa.getAddress(),
+// OLE.VT_I4, 0, varChildIndex.getInt(), 0, nia.getAddress())) {
+// pTopicIndex[0] = nia.getInt();
+// pHelpFile[0] = nsa.getString();
+// return true;
+// }
+ if (OLE.S_OK == getIAccessible().get_accHelpTopic(nsa.getAddress(), varChildIndex, nia.getAddress())) {
pTopicIndex[0] = nia.getInt();
pHelpFile[0] = nsa.getString();
return true;
@@ -652,9 +684,15 @@
return null;
NativeIntAccess nia = new NativeIntAccess(4);
try {
+// if (OLE.S_OK == getIAccessible().accLocation(nia.getAddress(0),
+// nia.getAddress(1), nia.getAddress(2), nia.getAddress(3),
+// OLE.VT_I4, 0, varChildIndex.getInt(), 0)) {
+// return new Rectangle(nia.getInt(0), nia.getInt(1), nia
+// .getInt(2), nia.getInt(3));
+// }
if (OLE.S_OK == getIAccessible().accLocation(nia.getAddress(0),
nia.getAddress(1), nia.getAddress(2), nia.getAddress(3),
- OLE.VT_I4, 0, varChildIndex.getInt(), 0)) {
+ varChildIndex)) {
return new Rectangle(nia.getInt(0), nia.getInt(1), nia
.getInt(2), nia.getInt(3));
}
@@ -666,21 +704,24 @@
}
public boolean doDefaultAction() {
- return OLE.S_OK == getIAccessible().accDoDefaultAction(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0);
+// return OLE.S_OK == getIAccessible().accDoDefaultAction(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0);
+ return OLE.S_OK == getIAccessible().accDoDefaultAction(varChildIndex);
}
public boolean select(int flagsSelect) {
- return OLE.S_OK == getIAccessible().accSelect(flagsSelect, OLE.VT_I4,
- 0, varChildIndex.getInt(), 0);
+// return OLE.S_OK == getIAccessible().accSelect(flagsSelect, OLE.VT_I4,
+// 0, varChildIndex.getInt(), 0);
+ return OLE.S_OK == getIAccessible().accSelect(flagsSelect, varChildIndex);
}
public boolean setAccName(String strName) {
NativeStringAccess nsa = new NativeStringAccess();
try {
nsa.setString(strName);
- return OLE.S_OK == getIAccessible().put_accName(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nsa.getAddress());
+// return OLE.S_OK == getIAccessible().put_accName(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nsa.getAddress());
+ return OLE.S_OK == getIAccessible().put_accName(varChildIndex, nsa.getAddress());
} finally {
nsa.dispose();
}
@@ -690,8 +731,9 @@
NativeStringAccess nsa = new NativeStringAccess();
try {
nsa.setString(strValue);
- return OLE.S_OK == getIAccessible().put_accValue(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nsa.getAddress());
+// return OLE.S_OK == getIAccessible().put_accValue(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nsa.getAddress());
+ return OLE.S_OK == getIAccessible().put_accValue(varChildIndex, nsa.getAddress());
} finally {
nsa.dispose();
}
@@ -721,8 +763,11 @@
private Variant getAccChild(Variant varChild) {
NativeIntAccess nia = new NativeIntAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accChild(OLE.VT_I4, 0,
- varChild.getInt(), 0, nia.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accChild(OLE.VT_I4, 0,
+// varChild.getInt(), 0, nia.getAddress())) {
+// return new Variant(new IDispatch(nia.getInt()));
+// }
+ if (OLE.S_OK == getIAccessible().get_accChild(varChild, nia.getAddress())) {
return new Variant(new IDispatch(nia.getInt()));
}
} catch (Exception e) {
@@ -914,8 +959,11 @@
if (-1 == ia1Role) {
NativeVariantAccess nva = new NativeVariantAccess();
try {
- if (OLE.S_OK == getIAccessible().get_accRole(OLE.VT_I4, 0,
- varChildIndex.getInt(), 0, nva.getAddress())) {
+// if (OLE.S_OK == getIAccessible().get_accRole(OLE.VT_I4, 0,
+// varChildIndex.getInt(), 0, nva.getAddress())) {
+// return nva.getString();
+// }
+ if (OLE.S_OK == getIAccessible().get_accRole(varChildIndex, nva.getAddress())) {
return nva.getString();
}
} finally {
@@ -937,7 +985,7 @@
return Platform.getAdapterManager().getAdapter(this, adapter);
}
- public int getPtr() {
+ public long getPtr() {
return getIAccessible().getAddress();
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalAccessibleObjectFactory.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalAccessibleObjectFactory.java
index 257382b..58d7dbd 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalAccessibleObjectFactory.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalAccessibleObjectFactory.java
@@ -32,7 +32,7 @@
return monitor;
}
- public AccessibleObject getAccessibleObjectFromEvent(int hwnd, int dwId, int dwChildId) {
+ public AccessibleObject getAccessibleObjectFromEvent(long hwnd, int dwId, int dwChildId) {
return InternalAccessibleObject.getAccessibleObjectFromEvent(hwnd, dwId, dwChildId);
}
@@ -40,7 +40,7 @@
return InternalAccessibleObject.getAccessibleObjectFromPoint(point);
}
- public AccessibleObject getAccessibleObjectFromWindow(int hwnd) {
+ public AccessibleObject getAccessibleObjectFromWindow(long hwnd) {
return InternalAccessibleObject.getAccessibleObjectFromWindow(hwnd);
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalEventMonitor.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalEventMonitor.java
index b4e2b3c..d6ede05 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalEventMonitor.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalEventMonitor.java
@@ -22,7 +22,7 @@
public class InternalEventMonitor implements IAccessibleEventMonitor {
private Callback callback = null;
- private int hWinEventHook = 0;
+ private long hWinEventHook = 0;
private IAccessibleEventListener listener = null;
private Set<Integer> filter;
@@ -34,7 +34,7 @@
this.listener = listener;
this.filter = filter;
callback = new Callback(this,"WinEventProc",7); //$NON-NLS-1$
- int address = callback.getAddress();
+ long address = callback.getAddress();
if (address == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
hWinEventHook = MSAA.SetWinEventHook(0x00000001, 0x7FFFFFFF, 0, address, 0, 0,0);
}
@@ -53,7 +53,7 @@
}
}
- int WinEventProc(int hEvent, int event, int hwnd, int idObject, int idChild, int idThread, int dwEventTime) {
+ long WinEventProc(long hEvent, long event, long hwnd, long idObject, long idChild, long idThread, long dwEventTime) {
// System.out.println( "hEvent=0x"+Integer.toHexString(hEvent) +", "+
// "event=0x"+Integer.toHexString(event) +", "+
// "hwnd=0x"+Integer.toHexString(hwnd) +", "+
@@ -61,8 +61,8 @@
// "idChild=0x"+Integer.toHexString(idChild) +", "+
// "idThread=0x"+Integer.toHexString(idThread) +", "+
// "dwEventTime=0x"+Integer.toHexString(dwEventTime) );
- if( null != listener && checkFilter(event) ) {
- listener.handleEvent(event, hwnd, idObject, idChild, null);
+ if( null != listener && checkFilter((int)event) ) {
+ listener.handleEvent((int)event, hwnd, (int)idObject, (int)idChild, null);
}
return 0;
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessible2.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessible2.java
index ff31f42..fb7aa50 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessible2.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessible2.java
@@ -22,22 +22,22 @@
public class IAccessible2 extends IAccessible {
public static final GUID IID = COMUtil.IIDFromString("{E89F726E-C4F4-4C19-BB19-B647D7FA8478}"); //$NON-NLS-1$
- int address;
- public IAccessible2(int address) {
+ long address;
+ public IAccessible2(long address) {
super(address);
this.address = address;
}
- public int get_nRelations(int pnRelations) {
- return COMUtil.VtblCall(28, address, pnRelations);
+ public int get_nRelations(long pnRelations) {
+ return COM.VtblCall(28, address, pnRelations);
}
- public int get_relation(int relationIndex, int pdispRelation){
- return COMUtil.VtblCall(29, address, relationIndex, pdispRelation);
+ public int get_relation(int relationIndex, long pdispRelation){
+ return COM.VtblCall(29, address, relationIndex, pdispRelation);
}
- public int get_relations(int maxRelations, int pdispRelation,int pnRelations) {
- return COMUtil.VtblCall(30, address, maxRelations, pdispRelation, pnRelations);
+ public int get_relations(int maxRelations, long pdispRelation,long pnRelations) {
+ return COM.VtblCall(30, address, maxRelations, pdispRelation, pnRelations);
}
- public int get_role(int pRole) {
+ public int get_role(long pRole) {
return COM.VtblCall(31, address, pRole);
}
public int scrollTo(int scrollType) {
@@ -46,41 +46,41 @@
public int scrollToPoint(int coordinateType, int x, int y) {
return COMUtil.VtblCall(33, address, coordinateType, x, y); // TODO
}
- public int get_groupPosition(int pGroupLevel, int pSimilarItemsInGroup, int pPositionInGroup) {
- return COMUtil.VtblCall(34, address, pGroupLevel, pSimilarItemsInGroup, pPositionInGroup);
+ public int get_groupPosition(long pGroupLevel, long pSimilarItemsInGroup, long pPositionInGroup) {
+ return COM.VtblCall(34, address, pGroupLevel, pSimilarItemsInGroup, pPositionInGroup);
}
- public int get_states(int pdispStates ) {
- return COMUtil.VtblCall(35, address, pdispStates);
+ public int get_states(long pdispStates ) {
+ return COM.VtblCall(35, address, pdispStates);
}
- public int get_extendedRole(int pszExtendedRole) {
- return COMUtil.VtblCall(36, address, pszExtendedRole);
+ public int get_extendedRole(long pszExtendedRole) {
+ return COM.VtblCall(36, address, pszExtendedRole);
}
- public int get_localizedExtendedRole(int pszLocalizedExtendedRole) {
- return COMUtil.VtblCall(37, address, pszLocalizedExtendedRole);
+ public int get_localizedExtendedRole(long pszLocalizedExtendedRole) {
+ return COM.VtblCall(37, address, pszLocalizedExtendedRole);
}
- public int get_nExtendedStates(int pnExtendedStates) {
- return COMUtil.VtblCall(38, address, pnExtendedStates);
+ public int get_nExtendedStates(long pnExtendedStates) {
+ return COM.VtblCall(38, address, pnExtendedStates);
}
- public int get_extendedStates(int maxExtendedStates,int ppszExtendedStates,int pnExtendedStates) {
- return COMUtil.VtblCall(39, address, maxExtendedStates, ppszExtendedStates, pnExtendedStates);
+ public int get_extendedStates(int maxExtendedStates,long ppszExtendedStates,long pnExtendedStates) {
+ return COM.VtblCall(39, address, maxExtendedStates, ppszExtendedStates, pnExtendedStates);
}
- public int get_localizedExtendedStates(int maxLocalizedExtendedStates,int ppszLocalizedExtendedStates,int pnLocalizedExtendedStates) {
- return COMUtil.VtblCall(40, address, maxLocalizedExtendedStates, ppszLocalizedExtendedStates, pnLocalizedExtendedStates);
+ public int get_localizedExtendedStates(int maxLocalizedExtendedStates,long ppszLocalizedExtendedStates,long pnLocalizedExtendedStates) {
+ return COM.VtblCall(40, address, maxLocalizedExtendedStates, ppszLocalizedExtendedStates, pnLocalizedExtendedStates);
}
- public int get_uniqueID(int pUniqueID) {
- return COMUtil.VtblCall(41, address, pUniqueID);
+ public int get_uniqueID(long pUniqueID) {
+ return COM.VtblCall(41, address, pUniqueID);
}
- public int get_windowHandle(int pWindowHandle) {
- return COMUtil.VtblCall(42, address, pWindowHandle);
+ public int get_windowHandle(long pWindowHandle) {
+ return COM.VtblCall(42, address, pWindowHandle);
}
- public int get_indexInParent(int pIndexInParent) {
- return COMUtil.VtblCall(43, address, pIndexInParent);
+ public int get_indexInParent(long pIndexInParent) {
+ return COM.VtblCall(43, address, pIndexInParent);
}
- public int get_locale(int pLocale) {
- return COMUtil.VtblCall(44, address, pLocale);
+ public int get_locale(long pLocale) {
+ return COM.VtblCall(44, address, pLocale);
}
- public int get_attributes(int pszAttributes) {
- return COMUtil.VtblCall(45, address, pszAttributes);
+ public int get_attributes(long pszAttributes) {
+ return COM.VtblCall(45, address, pszAttributes);
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleAction.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleAction.java
index 8831a2e..1e3cdfc 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleAction.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleAction.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IUnknown;
@@ -20,28 +21,28 @@
public class IAccessibleAction extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{B70D9F59-3B5A-4dba-AB9E-22012F607DF5}"); //$NON-NLS-1$
- int address;
- public IAccessibleAction(int address) {
+ long address;
+ public IAccessibleAction(long address) {
super(address);
this.address = address;
}
- public int nActions(int pnActions) {
- return COMUtil.VtblCall(3, address, pnActions);
+ public int nActions(long pnActions) {
+ return COM.VtblCall(3, address, pnActions);
}
public int doAction(int actionIndex) {
return COMUtil.VtblCall(4, address, actionIndex);
}
- public int get_description(int actionIndex, int pszDescription) {
- return COMUtil.VtblCall(5, address, actionIndex, pszDescription);
+ public int get_description(int actionIndex, long pszDescription) {
+ return COM.VtblCall(5, address, actionIndex, pszDescription);
}
- public int get_keyBinding(int actionIndex, int nMaxBinding, int ppszKeyBinding, int pnBinding) {
+ public int get_keyBinding(int actionIndex, int nMaxBinding, long ppszKeyBinding, long pnBinding) {
return COMUtil.VtblCall(6, address, actionIndex, nMaxBinding, ppszKeyBinding, pnBinding);
}
- public int get_name(int actionIndex, int pszName) {
- return COMUtil.VtblCall(7, address, actionIndex, pszName);
+ public int get_name(int actionIndex, long pszName) {
+ return COM.VtblCall(7, address, actionIndex, pszName);
}
- public int get_localizedName(int actionIndex, int pszLocalizedName) {
- return COMUtil.VtblCall(8, address, actionIndex, pszLocalizedName);
+ public int get_localizedName(int actionIndex, long pszLocalizedName) {
+ return COM.VtblCall(8, address, actionIndex, pszLocalizedName);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleApplication.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleApplication.java
index cbf2d2d..74a4a18 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleApplication.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleApplication.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IUnknown;
@@ -20,22 +21,22 @@
public class IAccessibleApplication extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{D49DED83-5B25-43F4-9B95-93B44595979E}"); //$NON-NLS-1$
- int address;
- public IAccessibleApplication(int address) {
+ long address;
+ public IAccessibleApplication(long address) {
super(address);
this.address = address;
}
- public int get_appName(int pszName) {
- return COMUtil.VtblCall(3, address, pszName);
+ public int get_appName(long pszName) {
+ return COM.VtblCall(3, address, pszName);
}
- public int get_appVersion(int pszVersion) {
- return COMUtil.VtblCall(4, address, pszVersion);
+ public int get_appVersion(long pszVersion) {
+ return COM.VtblCall(4, address, pszVersion);
}
- public int get_toolkitName(int pszName) {
- return COMUtil.VtblCall(5, address, pszName);
+ public int get_toolkitName(long pszName) {
+ return COM.VtblCall(5, address, pszName);
}
- public int get_toolkitVersion(int pszVersion) {
- return COMUtil.VtblCall(6, address, pszVersion);
+ public int get_toolkitVersion(long pszVersion) {
+ return COM.VtblCall(6, address, pszVersion);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleComponent.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleComponent.java
index 747037b..1a77253 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleComponent.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleComponent.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IUnknown;
@@ -20,19 +21,19 @@
public class IAccessibleComponent extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{1546D4B0-4C98-4bda-89AE-9A64748BDDE4}"); //$NON-NLS-1$
- int address;
- public IAccessibleComponent(int address) {
+ long address;
+ public IAccessibleComponent(long address) {
super(address);
this.address = address;
}
- public int get_locationInParent(int pX, int pY) {
- return COMUtil.VtblCall(3, address, pX, pY);
+ public int get_locationInParent(long pX, long pY) {
+ return COM.VtblCall(3, address, pX, pY);
}
- public int get_foreground(int pForeground) {
- return COMUtil.VtblCall(4, address, pForeground);
+ public int get_foreground(long pForeground) {
+ return COM.VtblCall(4, address, pForeground);
}
- public int get_background(int pBackground) {
- return COMUtil.VtblCall(5, address, pBackground);
+ public int get_background(long pBackground) {
+ return COM.VtblCall(5, address, pBackground);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleEditableText.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleEditableText.java
index 6cc1201..2401a07 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleEditableText.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleEditableText.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IUnknown;
@@ -20,8 +21,8 @@
public class IAccessibleEditableText extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{A59AA09A-7011-4b65-939D-32B1FB5547E3}"); //$NON-NLS-1$
- int address;
- public IAccessibleEditableText(int address) {
+ long address;
+ public IAccessibleEditableText(long address) {
super(address);
this.address = address;
}
@@ -32,8 +33,8 @@
public int deleteText(int startOffset, int endOffset) {
return COMUtil.VtblCall(4, address, startOffset, endOffset);
}
- public int insertText(int offset, int pszText) {
- return COMUtil.VtblCall(5, address, offset, pszText);
+ public int insertText(int offset, long pszText) {
+ return COM.VtblCall(5, address, offset, pszText);
}
public int cutText(int startOffset, int endOffset) {
return COMUtil.VtblCall(6, address, startOffset, endOffset);
@@ -41,10 +42,10 @@
public int pasteText(int offset) {
return COMUtil.VtblCall(7, address, offset);
}
- public int replaceText(int startOffset, int endOffset, int pszText) {
- return COMUtil.VtblCall(8, address, startOffset, endOffset, pszText);
+ public int replaceText(int startOffset, int endOffset, long pszText) {
+ return COM.VtblCall(8, address, startOffset, endOffset, pszText);
}
- public int setAttributes(int startOffset, int endOffset, int pszAttributes) {
- return COMUtil.VtblCall(9, address, startOffset, endOffset, pszAttributes);
+ public int setAttributes(int startOffset, int endOffset, long pszAttributes) {
+ return COM.VtblCall(9, address, startOffset, endOffset, pszAttributes);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleHyperlink.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleHyperlink.java
index 7a1da2e..3b5da6a 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleHyperlink.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleHyperlink.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
@@ -19,25 +20,25 @@
public class IAccessibleHyperlink extends IAccessibleAction {
public static final GUID IID = COMUtil.IIDFromString("{01C20F2B-3DD2-400f-949F-AD00BDAB1D41}"); //$NON-NLS-1$
- int address;
- public IAccessibleHyperlink(int address) {
+ long address;
+ public IAccessibleHyperlink(long address) {
super(address);
this.address = address;
}
- public int get_anchor(int index, int pvarAnchor) {
- return COMUtil.VtblCall(9, address, index, pvarAnchor);
+ public int get_anchor(int index, long pvarAnchor) {
+ return COM.VtblCall(9, address, index, pvarAnchor);
}
- public int get_anchorTarget(int index, int pvarAnchorTarget) {
- return COMUtil.VtblCall(10, address, index, pvarAnchorTarget);
+ public int get_anchorTarget(int index, long pvarAnchorTarget) {
+ return COM.VtblCall(10, address, index, pvarAnchorTarget);
}
- public int get_startIndex(int pIndex) {
- return COMUtil.VtblCall(11, address, pIndex);
+ public int get_startIndex(long pIndex) {
+ return COM.VtblCall(11, address, pIndex);
}
- public int get_endIndex(int pIndex) {
- return COMUtil.VtblCall(12, address, pIndex);
+ public int get_endIndex(long pIndex) {
+ return COM.VtblCall(12, address, pIndex);
}
- public int get_valid(int pValid) {
- return COMUtil.VtblCall(13, address, pValid);
+ public int get_valid(long pValid) {
+ return COM.VtblCall(13, address, pValid);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleHypertext.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleHypertext.java
index 33b4f28..9c7350b 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleHypertext.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleHypertext.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
@@ -19,19 +20,19 @@
public class IAccessibleHypertext extends IAccessibleText {
public static final GUID IID = COMUtil.IIDFromString("{6B4F8BBF-F1F2-418a-B35E-A195BC4103B9}"); //$NON-NLS-1$
- int address;
- public IAccessibleHypertext(int address) {
+ long address;
+ public IAccessibleHypertext(long address) {
super(address);
this.address = address;
}
- public int get_nHyperlinks(int pHyperlinkCount) {
- return COMUtil.VtblCall(22, address, pHyperlinkCount);
+ public int get_nHyperlinks(long pHyperlinkCount) {
+ return COM.VtblCall(22, address, pHyperlinkCount);
}
- public int get_hyperlink(int index, int pdispHyperlink) {
- return COMUtil.VtblCall(23, address, index, pdispHyperlink);
+ public int get_hyperlink(int index, long pdispHyperlink) {
+ return COM.VtblCall(23, address, index, pdispHyperlink);
}
- public int get_hyperlinkIndex(int charIndex, int pHyperlinkIndex) {
- return COMUtil.VtblCall(24, address, charIndex, pHyperlinkIndex);
+ public int get_hyperlinkIndex(int charIndex, long pHyperlinkIndex) {
+ return COM.VtblCall(24, address, charIndex, pHyperlinkIndex);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleImage.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleImage.java
index 4b4781e..79b23d8 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleImage.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleImage.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IUnknown;
@@ -20,19 +21,19 @@
public class IAccessibleImage extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{FE5ABB3D-615E-4f7b-909F-5F0EDA9E8DDE}"); //$NON-NLS-1$
- int address;
- public IAccessibleImage(int address) {
+ long address;
+ public IAccessibleImage(long address) {
super(address);
this.address = address;
}
- public int get_description(int pszDescription) {
- return COMUtil.VtblCall(3, address, pszDescription);
+ public int get_description(long pszDescription) {
+ return COM.VtblCall(3, address, pszDescription);
}
- public int get_imagePosition(int coordinateType, int pX, int pY) {
- return COMUtil.VtblCall(4, address, coordinateType, pX, pY);
+ public int get_imagePosition(int coordinateType, long pX, long pY) {
+ return COM.VtblCall(4, address, coordinateType, pX, pY);
}
- public int get_imageSize(int pWidth, int pHeight) {
- return COMUtil.VtblCall(5, address, pWidth, pHeight);
+ public int get_imageSize(long pWidth, long pHeight) {
+ return COM.VtblCall(5, address, pWidth, pHeight);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleRelation.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleRelation.java
index 0987aa9..c83e22f 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleRelation.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleRelation.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IUnknown;
@@ -20,25 +21,25 @@
public class IAccessibleRelation extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{7CDF86EE-C3DA-496a-BDA4-281B336E1FDC}"); //$NON-NLS-1$
- int address;
- public IAccessibleRelation(int address) {
+ long address;
+ public IAccessibleRelation(long address) {
super(address);
this.address = address;
}
- public int get_relationType(int pszRelationType) {
- return COMUtil.VtblCall(3, address, pszRelationType);
+ public int get_relationType(long pszRelationType) {
+ return COM.VtblCall(3, address, pszRelationType);
}
- public int get_localizedRelationType(int pszLocalizedRelationType) {
- return COMUtil.VtblCall(4, address, pszLocalizedRelationType);
+ public int get_localizedRelationType(long pszLocalizedRelationType) {
+ return COM.VtblCall(4, address, pszLocalizedRelationType);
}
- public int get_nTargets(int pnTargets) {
- return COMUtil.VtblCall(5, address, pnTargets);
+ public int get_nTargets(long pnTargets) {
+ return COM.VtblCall(5, address, pnTargets);
}
- public int get_target(int targetIndex, int punkTarget) {
- return COMUtil.VtblCall(6, address, targetIndex, punkTarget);
+ public int get_target(int targetIndex, long punkTarget) {
+ return COM.VtblCall(6, address, targetIndex, punkTarget);
}
- public int get_targets(int maxTargets, int punkTarget, int pnTargets) {
- return COMUtil.VtblCall(7, address, maxTargets, punkTarget, pnTargets);
+ public int get_targets(int maxTargets, long punkTarget, long pnTargets) {
+ return COM.VtblCall(7, address, maxTargets, punkTarget, pnTargets);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleTable.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleTable.java
index 7993cf5..732926f 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleTable.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleTable.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IUnknown;
@@ -20,80 +21,80 @@
public class IAccessibleTable extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{35AD8070-C20C-4fb4-B094-F4F7275DD469}"); //$NON-NLS-1$
- int address;
- public IAccessibleTable(int address) {
+ long address;
+ public IAccessibleTable(long address) {
super(address);
this.address = address;
}
- public int get_accessibleAt(int row, int column, int pdispAccessible) {
- return COMUtil.VtblCall(3, address, row, column, pdispAccessible);
+ public int get_accessibleAt(int row, int column, long pdispAccessible) {
+ return COM.VtblCall(3, address, row, column, pdispAccessible);
}
- public int get_caption(int pdispAccessible) {
- return COMUtil.VtblCall(4, address, pdispAccessible);
+ public int get_caption(long pdispAccessible) {
+ return COM.VtblCall(4, address, pdispAccessible);
}
- public int get_childIndex(int rowIndex, int columnIndex, int pChildIndex) {
- return COMUtil.VtblCall(5, address, rowIndex, columnIndex, pChildIndex);
+ public int get_childIndex(int rowIndex, int columnIndex, long pChildIndex) {
+ return COM.VtblCall(5, address, rowIndex, columnIndex, pChildIndex);
}
- public int get_columnDescription(int column, int pszDescription) {
- return COMUtil.VtblCall(6, address, column, pszDescription);
+ public int get_columnDescription(int column, long pszDescription) {
+ return COM.VtblCall(6, address, column, pszDescription);
}
- public int get_columnExtentAt(int row, int column, int pnColumnsSpanned) {
- return COMUtil.VtblCall(7, address, row, column, pnColumnsSpanned);
+ public int get_columnExtentAt(int row, int column, long pnColumnsSpanned) {
+ return COM.VtblCall(7, address, row, column, pnColumnsSpanned);
}
- public int get_columnHeader(int pdispAccessibleTable, int pStartingRowIndex) {
- return COMUtil.VtblCall(8, address, pdispAccessibleTable, pStartingRowIndex);
+ public int get_columnHeader(long pdispAccessibleTable, long pStartingRowIndex) {
+ return COM.VtblCall(8, address, pdispAccessibleTable, pStartingRowIndex);
}
- public int get_columnIndex(int childIndex, int pColumnIndex) {
- return COMUtil.VtblCall(9, address, childIndex, pColumnIndex);
+ public int get_columnIndex(int childIndex, long pColumnIndex) {
+ return COM.VtblCall(9, address, childIndex, pColumnIndex);
}
- public int get_nColumns(int pColumnCount) {
- return COMUtil.VtblCall(10, address, pColumnCount);
+ public int get_nColumns(long pColumnCount) {
+ return COM.VtblCall(10, address, pColumnCount);
}
- public int get_nRows(int pRowCount) {
- return COMUtil.VtblCall(11, address, pRowCount);
+ public int get_nRows(long pRowCount) {
+ return COM.VtblCall(11, address, pRowCount);
}
- public int get_nSelectedChildren(int pChildCount) {
- return COMUtil.VtblCall(12, address, pChildCount);
+ public int get_nSelectedChildren(long pChildCount) {
+ return COM.VtblCall(12, address, pChildCount);
}
- public int get_nSelectedColumns(int pColumnCount) {
- return COMUtil.VtblCall(13, address, pColumnCount);
+ public int get_nSelectedColumns(long pColumnCount) {
+ return COM.VtblCall(13, address, pColumnCount);
}
- public int get_nSelectedRows(int pRowCount) {
- return COMUtil.VtblCall(14, address, pRowCount);
+ public int get_nSelectedRows(long pRowCount) {
+ return COM.VtblCall(14, address, pRowCount);
}
- public int get_rowDescription(int row, int pszDescription) {
- return COMUtil.VtblCall(15, address, row, pszDescription);
+ public int get_rowDescription(int row, long pszDescription) {
+ return COM.VtblCall(15, address, row, pszDescription);
}
- public int get_rowExtentAt(int row, int column, int pnRowsSpanned) {
- return COMUtil.VtblCall(16, address, row, column, pnRowsSpanned);
+ public int get_rowExtentAt(int row, int column, long pnRowsSpanned) {
+ return COM.VtblCall(16, address, row, column, pnRowsSpanned);
}
- public int get_rowHeader(int pdispAccessibleTable, int pStartingColumnIndex) {
- return COMUtil.VtblCall(17, address, pdispAccessibleTable, pStartingColumnIndex);
+ public int get_rowHeader(long pdispAccessibleTable, long pStartingColumnIndex) {
+ return COM.VtblCall(17, address, pdispAccessibleTable, pStartingColumnIndex);
}
- public int get_rowIndex(int childIndex, int pRowIndex) {
- return COMUtil.VtblCall(18, address, childIndex, pRowIndex);
+ public int get_rowIndex(int childIndex, long pRowIndex) {
+ return COM.VtblCall(18, address, childIndex, pRowIndex);
}
- public int get_selectedChildren(int maxChildren, int ppChildren, int pnChildren) {
- return COMUtil.VtblCall(19, address, maxChildren, ppChildren, pnChildren);
+ public int get_selectedChildren(int maxChildren, long ppChildren, long pnChildren) {
+ return COM.VtblCall(19, address, maxChildren, ppChildren, pnChildren);
}
- public int get_selectedRows(int maxRows, int ppRows, int pnRows) {
- return COMUtil.VtblCall(20, address, maxRows, ppRows, pnRows);
+ public int get_selectedRows(int maxRows, long ppRows, long pnRows) {
+ return COM.VtblCall(20, address, maxRows, ppRows, pnRows);
}
- public int get_selectedColumns(int maxColumns, int ppColumns, int pnColumns) {
- return COMUtil.VtblCall(21, address, maxColumns, ppColumns, pnColumns);
+ public int get_selectedColumns(int maxColumns, long ppColumns, long pnColumns) {
+ return COM.VtblCall(21, address, maxColumns, ppColumns, pnColumns);
}
- public int get_summary(int pdispAccessible) {
- return COMUtil.VtblCall(22, address, pdispAccessible);
+ public int get_summary(long pdispAccessible) {
+ return COM.VtblCall(22, address, pdispAccessible);
}
- public int get_isColumnSelected(int column, int pIsSelected) {
- return COMUtil.VtblCall(23, address, column, pIsSelected);
+ public int get_isColumnSelected(int column, long pIsSelected) {
+ return COM.VtblCall(23, address, column, pIsSelected);
}
- public int get_isRowSelected(int row, int pIsSelected) {
- return COMUtil.VtblCall(24, address, row, pIsSelected);
+ public int get_isRowSelected(int row, long pIsSelected) {
+ return COM.VtblCall(24, address, row, pIsSelected);
}
- public int get_isSelected(int row, int column, int pIsSelected) {
- return COMUtil.VtblCall(25, address, row, column, pIsSelected);
+ public int get_isSelected(int row, int column, long pIsSelected) {
+ return COM.VtblCall(25, address, row, column, pIsSelected);
}
public int selectRow(int row) {
return COMUtil.VtblCall(26, address, row);
@@ -107,10 +108,10 @@
public int unselectColumn(int column) {
return COMUtil.VtblCall(29, address, column);
}
- public int get_rowColumnExtentsAtIndex(int index, int pRow, int pColumn, int pRowExtents, int pColumnExtents, int pIsSelected) {
+ public int get_rowColumnExtentsAtIndex(int index, long pRow, long pColumn, long pRowExtents, long pColumnExtents, long pIsSelected) {
return COMUtil.VtblCall(30, address, index, pRow, pColumn, pRowExtents, pColumnExtents, pIsSelected);
}
- public int get_modelChange(int pModelChange) {
- return COMUtil.VtblCall(31, address, pModelChange);
+ public int get_modelChange(long pModelChange) {
+ return COM.VtblCall(31, address, pModelChange);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleText.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleText.java
index 4779c17..94ee460 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleText.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleText.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IUnknown;
@@ -20,8 +21,8 @@
public class IAccessibleText extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{24FD2FFB-3AAD-4a08-8335-A3AD89C0FB4B}"); //$NON-NLS-1$
- int address;
- public IAccessibleText(int address) {
+ long address;
+ public IAccessibleText(long address) {
super(address);
this.address = address;
}
@@ -29,34 +30,34 @@
public int addSelection(int startOffset, int endOffset) {
return COMUtil.VtblCall(3, address, startOffset, endOffset);
}
- public int get_attributes(int offset,int pStartOffset, int pEndOffset, int pszTextAttributes) {
+ public int get_attributes(int offset,long pStartOffset, long pEndOffset, long pszTextAttributes) {
return COMUtil.VtblCall(4, address, offset, pStartOffset, pEndOffset, pszTextAttributes);
}
- public int get_caretOffset(int pOffset) {
- return COMUtil.VtblCall(5, address, pOffset);
+ public int get_caretOffset(long pOffset) {
+ return COM.VtblCall(5, address, pOffset);
}
- public int get_characterExtents(int offset, int coordType,int pX, int pY, int pWidth, int pHeight) {
+ public int get_characterExtents(int offset, int coordType,long pX, long pY, long pWidth, long pHeight) {
return COMUtil.VtblCall(6, address, offset, coordType, pX, pY, pWidth, pHeight);
}
- public int get_nSelections(int pnSelections) {
- return COMUtil.VtblCall(7, address, pnSelections);
+ public int get_nSelections(long pnSelections) {
+ return COM.VtblCall(7, address, pnSelections);
}
- public int get_offsetAtPoint(int x, int y, int coordType, int pOffset) {
+ public int get_offsetAtPoint(int x, int y, int coordType, long pOffset) {
return COMUtil.VtblCall(8, address, x, y, coordType, pOffset);
}
- public int get_selection(int selectionIndex,int pStartOffset,int pEndOffset) {
- return COMUtil.VtblCall(9, address, selectionIndex, pStartOffset, pEndOffset);
+ public int get_selection(int selectionIndex,long pStartOffset,long pEndOffset) {
+ return COM.VtblCall(9, address, selectionIndex, pStartOffset, pEndOffset);
}
- public int get_text(int startOffset, int endOffset, int pszText) {
- return COMUtil.VtblCall(10, address, startOffset, endOffset, pszText);
+ public int get_text(int startOffset, int endOffset, long pszText) {
+ return COM.VtblCall(10, address, startOffset, endOffset, pszText);
}
- public int get_textBeforeOffset(int offset, int boundaryType, int pStartOffset, int pEndOffset, int pszText) {
+ public int get_textBeforeOffset(int offset, int boundaryType, long pStartOffset, long pEndOffset, long pszText) {
return COMUtil.VtblCall(11, address, offset, boundaryType, pStartOffset, pEndOffset, pszText);
}
- public int get_textAfterOffset(int offset, int boundaryType, int pStartOffset, int pEndOffset, int pszText) {
+ public int get_textAfterOffset(int offset, int boundaryType, long pStartOffset, long pEndOffset, long pszText) {
return COMUtil.VtblCall(12, address, offset, boundaryType, pStartOffset, pEndOffset, pszText);
}
- public int get_textAtOffset(int offset, int boundaryType, int pStartOffset, int pEndOffset, int pszText) {
+ public int get_textAtOffset(int offset, int boundaryType, long pStartOffset, long pEndOffset, long pszText) {
return COMUtil.VtblCall(13, address, offset, boundaryType, pStartOffset, pEndOffset, pszText);
}
public int removeSelection(int selectionIndex) {
@@ -68,8 +69,8 @@
public int setSelection(int selectionIndex, int startOffset, int endOffset) {
return COMUtil.VtblCall(16, address, selectionIndex, startOffset, endOffset);
}
- public int get_nCharacters(int pnCharacters) {
- return COMUtil.VtblCall(17, address, pnCharacters);
+ public int get_nCharacters(long pnCharacters) {
+ return COM.VtblCall(17, address, pnCharacters);
}
public int scrollSubstringTo(int startIndex, int endIndex, int scrollType) {
return COMUtil.VtblCall(18, address, startIndex, endIndex, scrollType);
@@ -77,10 +78,10 @@
public int scrollSubstringToPoint(int startIndex, int endIndex, int coordinateType, int x, int y) {
return COMUtil.VtblCall(19, address, startIndex, endIndex, coordinateType, x, y);
}
- public int get_newText(int pNewText) {
- return COMUtil.VtblCall(20, address, pNewText);
+ public int get_newText(long pNewText) {
+ return COM.VtblCall(20, address, pNewText);
}
- public int get_oldText(int pOldText) {
- return COMUtil.VtblCall(21, address, pOldText);
+ public int get_oldText(long pOldText) {
+ return COM.VtblCall(21, address, pOldText);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleValue.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleValue.java
index f93d6e1..c020ac5 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleValue.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/IAccessibleValue.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.accservice.swtbridge.internal.ia2;
import org.eclipse.actf.util.win32.COMUtil;
+import org.eclipse.swt.internal.ole.win32.COM;
import org.eclipse.swt.internal.ole.win32.GUID;
import org.eclipse.swt.internal.ole.win32.IUnknown;
@@ -20,22 +21,22 @@
public class IAccessibleValue extends IUnknown {
public static final GUID IID = COMUtil.IIDFromString("{35855B5B-C566-4fd0-A7B1-E65465600394}"); //$NON-NLS-1$
- int address;
- public IAccessibleValue(int address) {
+ long address;
+ public IAccessibleValue(long address) {
super(address);
this.address = address;
}
- public int get_currentValue(int pvarCurrentValue) {
- return COMUtil.VtblCall(3, address, pvarCurrentValue);
+ public int get_currentValue(long pvarCurrentValue) {
+ return COM.VtblCall(3, address, pvarCurrentValue);
}
- public int setCurrentValue(int varValue) {
- return COMUtil.VtblCall(4, address, varValue);
+ public int setCurrentValue(long varValue) {
+ return COM.VtblCall(4, address, varValue);
}
- public int get_maximumValue(int pvarMaximumValue) {
- return COMUtil.VtblCall(5, address, pvarMaximumValue);
+ public int get_maximumValue(long pvarMaximumValue) {
+ return COM.VtblCall(5, address, pvarMaximumValue);
}
- public int get_minimumValue(int pvarMinimumValue) {
- return COMUtil.VtblCall(6, address, pvarMinimumValue);
+ public int get_minimumValue(long pvarMinimumValue) {
+ return COM.VtblCall(6, address, pvarMinimumValue);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessible2.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessible2.java
index e98e9e8..8a72cd8 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessible2.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessible2.java
@@ -19,6 +19,7 @@
import org.eclipse.actf.util.win32.NativeIntAccess;
import org.eclipse.actf.util.win32.NativeStringAccess;
import org.eclipse.swt.internal.ole.win32.COM;
+import org.eclipse.swt.internal.win32.OS;
import org.eclipse.swt.ole.win32.OLE;
@@ -309,11 +310,11 @@
return null;
}
- public static String[] getStringArray(int pBSTR, int count, boolean bFree) {
+ public static String[] getStringArray(long pBSTR, int count, boolean bFree) {
String[] sRet = new String[count];
if( count > 0 ) {
- int[] hMem = new int[count];
- MemoryUtil.MoveMemory(hMem, pBSTR, 4*count);
+ long[] hMem = new long[count];
+ OS.MoveMemory(hMem, pBSTR, OS.PTR_SIZEOF * count);
for( int i=0; i<count; i++) {
sRet[i] = ""; //$NON-NLS-1$
if (0 != hMem[i]) {
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleAction.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleAction.java
index f273643..255af7f 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleAction.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleAction.java
@@ -24,7 +24,7 @@
private IAccessibleAction accessibleAction = null;
- public InternalAccessibleAction(int address) {
+ public InternalAccessibleAction(long address) {
accessibleAction = new IAccessibleAction(address);
accessibleAction.AddRef();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleApplication.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleApplication.java
index 924b4da..8a3cfd1 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleApplication.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleApplication.java
@@ -22,7 +22,7 @@
private IAccessibleApplication accessibleApplication = null;
- public InternalAccessibleApplication(int address) {
+ public InternalAccessibleApplication(long address) {
accessibleApplication = new IAccessibleApplication(address);
accessibleApplication.AddRef();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleComponent.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleComponent.java
index 22d0b27..a150188 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleComponent.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleComponent.java
@@ -23,7 +23,7 @@
private IAccessibleComponent accessibleComponent = null;
- public InternalAccessibleComponent(int address) {
+ public InternalAccessibleComponent(long address) {
accessibleComponent = new IAccessibleComponent(address);
accessibleComponent.AddRef();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleEditableText.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleEditableText.java
index 7cf47c7..645f696 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleEditableText.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleEditableText.java
@@ -22,7 +22,7 @@
private IAccessibleEditableText accessibleEditableText = null;
- public InternalAccessibleEditableText(int address) {
+ public InternalAccessibleEditableText(long address) {
accessibleEditableText = new IAccessibleEditableText(address);
accessibleEditableText.AddRef();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleHyperlink.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleHyperlink.java
index 814a210..4bf3ad7 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleHyperlink.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleHyperlink.java
@@ -24,7 +24,7 @@
private IAccessibleHyperlink accessibleHyperlink = null;
- public InternalAccessibleHyperlink(int address) {
+ public InternalAccessibleHyperlink(long address) {
accessibleHyperlink = new IAccessibleHyperlink(address);
accessibleHyperlink.AddRef();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleHypertext.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleHypertext.java
index 8cd3f84..08c6845 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleHypertext.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleHypertext.java
@@ -22,7 +22,7 @@
private IAccessibleHypertext accessibleHypertext = null;
- public InternalAccessibleHypertext(int address) {
+ public InternalAccessibleHypertext(long address) {
accessibleHypertext = new IAccessibleHypertext(address);
accessibleHypertext.AddRef();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleImage.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleImage.java
index 95f0162..9e3f660 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleImage.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleImage.java
@@ -24,7 +24,7 @@
private IAccessibleImage accessibleImage = null;
- public InternalAccessibleImage(int address) {
+ public InternalAccessibleImage(long address) {
accessibleImage = new IAccessibleImage(address);
accessibleImage.AddRef();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleRelation.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleRelation.java
index bae4c92..8c42e5e 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleRelation.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleRelation.java
@@ -25,7 +25,7 @@
private IAccessibleRelation accessibleRelation = null;
- public InternalAccessibleRelation(int address) {
+ public InternalAccessibleRelation(long address) {
accessibleRelation = new IAccessibleRelation(address);
accessibleRelation.AddRef();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleTable.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleTable.java
index 61febbe..7219287 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleTable.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleTable.java
@@ -29,7 +29,7 @@
private IAccessibleTable accessibleTable = null;
- public InternalAccessibleTable(int address) {
+ public InternalAccessibleTable(long address) {
accessibleTable = new IAccessibleTable(address);
accessibleTable.AddRef();
}
@@ -415,11 +415,11 @@
nia.getAddress(3),
nia.getAddress(4)) ) {
return new RowColumnExtents(
- nia.getAddress(0),
- nia.getAddress(1),
- nia.getAddress(2),
- nia.getAddress(3),
- 0!=nia.getAddress(4));
+ nia.getInt(0),
+ nia.getInt(1),
+ nia.getInt(2),
+ nia.getInt(3),
+ 0!=nia.getInt(4));
}
}
finally {
@@ -434,11 +434,11 @@
try {
if( OLE.S_OK == accessibleTable.get_modelChange(nia.getAddress()) ) {
return new AccessibleTableModelChange(
- nia.getAddress(0),
- nia.getAddress(1),
- nia.getAddress(2),
- nia.getAddress(3),
- nia.getAddress(4));
+ nia.getInt(0),
+ nia.getInt(1),
+ nia.getInt(2),
+ nia.getInt(3),
+ nia.getInt(4));
}
}
finally {
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleText.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleText.java
index 97ed8c9..a82e9ee 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleText.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleText.java
@@ -19,6 +19,7 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.internal.ole.win32.COM;
+import org.eclipse.swt.internal.win32.OS;
import org.eclipse.swt.ole.win32.OLE;
@@ -28,7 +29,7 @@
private IAccessibleText accessibleText = null;
- public InternalAccessibleText(int address) {
+ public InternalAccessibleText(long address) {
accessibleText = new IAccessibleText(address);
accessibleText.AddRef();
}
@@ -305,8 +306,8 @@
}
private static TextSegment getTextSegment(NativeIntAccess nia) {
- int[] hMem = new int[3];
- MemoryUtil.MoveMemory(hMem, nia.getAddress(), 4*hMem.length);
+ long[] hMem = new long[2];
+ OS.MoveMemory(hMem, nia.getAddress(), OS.PTR_SIZEOF * hMem.length);
if (0 != hMem[0]) {
try {
TextSegment textSegment = new TextSegment("",0,0); //$NON-NLS-1$
@@ -316,8 +317,8 @@
MemoryUtil.MoveMemory(buffer, hMem[0], size);
textSegment.text = new String(buffer);
}
- textSegment.start = hMem[1];
- textSegment.end = hMem[2];
+ textSegment.start = (int)hMem[1];
+ textSegment.end = (int)(hMem[1] >> 32);
return textSegment;
}
finally {
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleValue.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleValue.java
index 7874d9f..c130875 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleValue.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/ia2/InternalAccessibleValue.java
@@ -23,7 +23,7 @@
private IAccessibleValue accessibleValue = null;
- public InternalAccessibleValue(int address) {
+ public InternalAccessibleValue(long address) {
accessibleValue = new IAccessibleValue(address);
accessibleValue.AddRef();
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowData.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowData.java
index 2f9a41f..ff0797c 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowData.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowData.java
@@ -31,7 +31,7 @@
private static final String categoryBrowser = Messages.msaa_external_browsers;
private static final String categoryWindow = Messages.msaa_external_windows;
- private int hwnd;
+ private long hwnd;
private boolean isBrowser;
private class DummyModelServiceHolder implements IModelServiceHolder {
@@ -79,7 +79,7 @@
* @param hwnd Window handle of the target window
* @param isBrowser set true if the target window is a Web browser
*/
- public GuiTargetWindowData(int hwnd, boolean isBrowser) {
+ public GuiTargetWindowData(long hwnd, boolean isBrowser) {
this.hwnd = hwnd;
this.isBrowser = isBrowser;
this.holder = new DummyModelServiceHolder(this);
@@ -125,7 +125,7 @@
* @see org.eclipse.actf.model.IModelService#getID()
*/
public String getID() {
- return getCategory() + "/" + Integer.toString(hwnd); //$NON-NLS-1$
+ return getCategory() + "/" + Long.toString(hwnd); //$NON-NLS-1$
}
/*
@@ -135,7 +135,7 @@
*/
public Object getAttribute(String name) {
if (IModelService.ATTR_WINDOWHANDLE.equals(name)) {
- return new Integer(hwnd);
+ return new Long(hwnd);
}
return null;
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowDataProvider.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowDataProvider.java
index 2414ebe..77c6eeb 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowDataProvider.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowDataProvider.java
@@ -26,7 +26,7 @@
public IModelService[] getModelService() {
List<GuiTargetWindowData> dsList = new ArrayList<GuiTargetWindowData>();
- int hwnd = WindowUtil.GetChildWindow (WindowUtil.GetDesktopWindow());
+ long hwnd = WindowUtil.GetChildWindow (WindowUtil.GetDesktopWindow());
while (hwnd != 0) {
if( WindowUtil.IsWindowVisible(hwnd) &&
!OverlayWindow.WINDOW_TEXT.equals(WindowUtil.GetWindowText(hwnd)) ) {
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/ScreenReaderRenderer.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/ScreenReaderRenderer.java
index e8af01c..52ce468 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/ScreenReaderRenderer.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/ScreenReaderRenderer.java
@@ -16,7 +16,6 @@
import org.eclipse.actf.accservice.swtbridge.MSAA;
import org.eclipse.actf.accservice.swtbridge.ia2.Accessible2;
import org.eclipse.actf.accservice.swtbridge.ia2.IA2Util;
-import org.eclipse.actf.model.flash.util.FlashMSAAUtil;
import org.eclipse.actf.visualization.gui.IGuiViewIDs;
import org.eclipse.actf.visualization.gui.ui.views.IFlashDOMView;
import org.eclipse.actf.visualization.gui.ui.views.MSAATreeContentProvider;
@@ -33,7 +32,7 @@
public class ScreenReaderRenderer {
private static final String SPACE = " "; //$NON-NLS-1$
- private int lastHwnd = 0;
+ private long lastHwnd = 0;
private String lastText = ""; //$NON-NLS-1$
private StyledText text;
private TextMap textMap;
@@ -144,39 +143,39 @@
display.syncExec(new Runnable() {
public void run() {
if (!(cancel || text.isDisposed())) {
- int hwnd = accObject.getWindow();
- if (hwnd != lastHwnd) {
- if (FlashMSAAUtil.isFlash(accObject
- .getPtr())) {
- String wmode = null;
- if (0 == hwnd) {
- wmode = FlashMSAAUtil
- .getHtmlAttribute(accObject
- .getPtr(), "WMode"); //$NON-NLS-1$
- }
- if (null == wmode) {
- AccessibleObject parentObject = accObject
- .getCachedParent();
- if (null != parentObject
- && hwnd != parentObject
- .getWindow()) {
- appendText(
- Messages.msaa_flash_start
- + "\n", SWT.COLOR_GRAY, SWT.COLOR_CYAN, false); //$NON-NLS-1$
- sayFlashEnd[0] = true;
- }
- } else {
- appendText(
- Messages.msaa_flash_inaccessible
- + " wmode=" + wmode + "\n", SWT.COLOR_GRAY, SWT.COLOR_RED, false); //$NON-NLS-1$ //$NON-NLS-2$
- if (null != flashDOMView) {
- flashDOMView
- .addWindowlessElement(accObject);
- }
- }
- }
- lastHwnd = hwnd;
- }
+// long hwnd = accObject.getWindow();
+// if (hwnd != lastHwnd) {
+// if (FlashMSAAUtil.isFlash(accObject
+// .getPtr())) {
+// String wmode = null;
+// if (0 == hwnd) {
+// wmode = FlashMSAAUtil
+// .getHtmlAttribute(accObject
+// .getPtr(), "WMode"); //$NON-NLS-1$
+// }
+// if (null == wmode) {
+// AccessibleObject parentObject = accObject
+// .getCachedParent();
+// if (null != parentObject
+// && hwnd != parentObject
+// .getWindow()) {
+// appendText(
+// Messages.msaa_flash_start
+// + "\n", SWT.COLOR_GRAY, SWT.COLOR_CYAN, false); //$NON-NLS-1$
+// sayFlashEnd[0] = true;
+// }
+// } else {
+// appendText(
+// Messages.msaa_flash_inaccessible
+// + " wmode=" + wmode + "\n", SWT.COLOR_GRAY, SWT.COLOR_RED, false); //$NON-NLS-1$ //$NON-NLS-2$
+// if (null != flashDOMView) {
+// flashDOMView
+// .addWindowlessElement(accObject);
+// }
+// }
+// }
+// lastHwnd = hwnd;
+// }
renderItem(accObject, false, index);
renderChildren[0] = provider
.getChildren(accObject);
@@ -213,7 +212,7 @@
String outText = null == accName ? "" : accName.replace('\u00A0', ' ').trim(); //$NON-NLS-1$
int accState = accObject.getAccState();
int accRole = accObject.getAccRole();
- boolean isFlash = FlashMSAAUtil.isFlash(accObject.getPtr());
+ boolean isFlash = false;//FlashMSAAUtil.isFlash(accObject.getPtr());
// boolean isBrowser = WebBrowserUtil.isBrowser(accObject);
boolean isBrowser = isBrowserContent(accObject.getClassName());
String prefix = "", postfix = ""; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TargetWindow.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TargetWindow.java
index ef1b5f6..c6bb3d9 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TargetWindow.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TargetWindow.java
@@ -1,147 +1,147 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Takashi ITOH - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.visualization.gui.internal.util;
-
-import org.eclipse.actf.model.ui.IModelService;
-import org.eclipse.actf.model.ui.editor.browser.IWebBrowserACTF;
-import org.eclipse.actf.util.win32.WindowUtil;
-import org.eclipse.actf.visualization.gui.TargetWindowDataProvider;
-import org.eclipse.actf.visualization.gui.internal.GuiTargetWindowData;
-import org.eclipse.swt.widgets.Composite;
-
-
-
-
-public class TargetWindow {
-
- private static Object currentElement = null;
-
- public static void setCurrentElement(Object element) {
- currentElement = element;
- }
-
- private static void update() {
- if( null == currentElement ) {
- setCurrentElement(TargetWindowDataCollector.getDefaultElement());
- }
- }
-
- public static boolean isEmbeddedBrowser() {
- update();
- return isEmbeddedBrowser(currentElement);
- }
-
- public static int getWindowHandle() {
- update();
- return getWindowHandle(currentElement);
- }
-
- public static String getID() {
- update();
- return getID(currentElement);
- }
-
- public static int getRootWindow() {
- update();
- return getRootWindow(currentElement);
- }
-
- /*
- * Utility functions
- */
- private static IModelService getModelService(Object element) {
- if( element instanceof IModelService ) {
- return (IModelService)element;
- }
- if( element instanceof TargetWindowDataProvider ) {
- return ((TargetWindowDataProvider)element).getActiveModelService();
- }
- return null;
- }
-
- private static int getWindowHandle(Object element) {
- IModelService modelService = getModelService(element);
- if( null != modelService ) {
- Composite composite = modelService.getTargetComposite();
- if( null != composite ) {
- return composite.handle;
- }
- Object objHandle = modelService.getAttribute(IModelService.ATTR_WINDOWHANDLE);
- if( objHandle instanceof Integer ) {
- return ((Integer)objHandle).intValue();
- }
- }
- return 0;
- }
-
- public static boolean isEmbeddedBrowser(Object element) {
- IModelService modelService = getModelService(element);
- if( null != modelService ) {
- return null != modelService.getTargetComposite();
- }
- return false;
- }
-
- private static boolean isBrowser(Object element) {
- IModelService modelService = getModelService(element);
- if( modelService instanceof GuiTargetWindowData ) {
- return ((GuiTargetWindowData)modelService).isBrowser();
- }
- return modelService instanceof IWebBrowserACTF;
- }
-
- public static String getTitle(Object element) {
- IModelService modelService = getModelService(element);
- if( null != modelService ) {
- return modelService.getTitle();
- }
- return null;
- }
-
- public static String getID(Object element) {
- IModelService modelService = getModelService(element);
- if( null != modelService ) {
- return modelService.getID();
- }
- return null;
- }
-
- public static int getRootWindow(Object element) {
- int hwnd = getWindowHandle(element);
- if( isBrowser(element) ) {
- int hwndChild = findBrowserChildren(hwnd);
- if( 0 != hwndChild ) {
- return hwndChild;
- }
- }
- return hwnd;
- }
-
- private static int findBrowserChildren(int hwnd) {
- if( 0 != hwnd ) {
- String className = WindowUtil.GetWindowClassName(hwnd);
- if( WebBrowserUtil.isBrowserClass(className) ) {
- return hwnd;
- }
- for( int hwndChild=WindowUtil.GetChildWindow (hwnd); 0!=hwndChild;
- hwndChild=WindowUtil.GetNextWindow (hwndChild) )
- {
- int hwndFound = findBrowserChildren(hwndChild);
- if( 0 != hwndFound ) {
- return hwndFound;
- }
- }
- }
- return 0;
- }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and Others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Takashi ITOH - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.actf.visualization.gui.internal.util;
+
+import org.eclipse.actf.model.ui.IModelService;
+import org.eclipse.actf.model.ui.editor.browser.IWebBrowserACTF;
+import org.eclipse.actf.util.win32.WindowUtil;
+import org.eclipse.actf.visualization.gui.TargetWindowDataProvider;
+import org.eclipse.actf.visualization.gui.internal.GuiTargetWindowData;
+import org.eclipse.swt.widgets.Composite;
+
+
+
+
+public class TargetWindow {
+
+ private static Object currentElement = null;
+
+ public static void setCurrentElement(Object element) {
+ currentElement = element;
+ }
+
+ private static void update() {
+ if( null == currentElement ) {
+ setCurrentElement(TargetWindowDataCollector.getDefaultElement());
+ }
+ }
+
+ public static boolean isEmbeddedBrowser() {
+ update();
+ return isEmbeddedBrowser(currentElement);
+ }
+
+ public static long getWindowHandle() {
+ update();
+ return getWindowHandle(currentElement);
+ }
+
+ public static String getID() {
+ update();
+ return getID(currentElement);
+ }
+
+ public static long getRootWindow() {
+ update();
+ return getRootWindow(currentElement);
+ }
+
+ /*
+ * Utility functions
+ */
+ private static IModelService getModelService(Object element) {
+ if( element instanceof IModelService ) {
+ return (IModelService)element;
+ }
+ if( element instanceof TargetWindowDataProvider ) {
+ return ((TargetWindowDataProvider)element).getActiveModelService();
+ }
+ return null;
+ }
+
+ private static long getWindowHandle(Object element) {
+ IModelService modelService = getModelService(element);
+ if( null != modelService ) {
+ Composite composite = modelService.getTargetComposite();
+ if( null != composite ) {
+ return composite.handle;
+ }
+ Object objHandle = modelService.getAttribute(IModelService.ATTR_WINDOWHANDLE);
+ if( objHandle instanceof Long ) {
+ return ((Long)objHandle).longValue();
+ }
+ }
+ return 0;
+ }
+
+ public static boolean isEmbeddedBrowser(Object element) {
+ IModelService modelService = getModelService(element);
+ if( null != modelService ) {
+ return null != modelService.getTargetComposite();
+ }
+ return false;
+ }
+
+ private static boolean isBrowser(Object element) {
+ IModelService modelService = getModelService(element);
+ if( modelService instanceof GuiTargetWindowData ) {
+ return ((GuiTargetWindowData)modelService).isBrowser();
+ }
+ return modelService instanceof IWebBrowserACTF;
+ }
+
+ public static String getTitle(Object element) {
+ IModelService modelService = getModelService(element);
+ if( null != modelService ) {
+ return modelService.getTitle();
+ }
+ return null;
+ }
+
+ public static String getID(Object element) {
+ IModelService modelService = getModelService(element);
+ if( null != modelService ) {
+ return modelService.getID();
+ }
+ return null;
+ }
+
+ public static long getRootWindow(Object element) {
+ long hwnd = getWindowHandle(element);
+ if( isBrowser(element) ) {
+ long hwndChild = findBrowserChildren(hwnd);
+ if( 0 != hwndChild ) {
+ return hwndChild;
+ }
+ }
+ return hwnd;
+ }
+
+ private static long findBrowserChildren(long hwnd) {
+ if( 0 != hwnd ) {
+ String className = WindowUtil.GetWindowClassName(hwnd);
+ if( WebBrowserUtil.isBrowserClass(className) ) {
+ return hwnd;
+ }
+ for( long hwndChild=WindowUtil.GetChildWindow (hwnd); 0!=hwndChild;
+ hwndChild=WindowUtil.GetNextWindow (hwndChild) )
+ {
+ long hwndFound = findBrowserChildren(hwndChild);
+ if( 0 != hwndFound ) {
+ return hwndFound;
+ }
+ }
+ }
+ return 0;
+ }
+
+}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/WebBrowserUtil.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/WebBrowserUtil.java
index 93d7201..c811792 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/WebBrowserUtil.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/WebBrowserUtil.java
@@ -20,7 +20,7 @@
"MozillaContentWindowClass" //$NON-NLS-1$
};
- public static boolean isBrowserFrame(int hwndFrame) {
+ public static boolean isBrowserFrame(long hwndFrame) {
String className = WindowUtil.GetWindowClassName(hwndFrame);
if( "MozillaUIWindowClass".equals(className) || //$NON-NLS-1$
"IEFrame".equals(className) ) { //$NON-NLS-1$
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/checker/MSAAProblemChecker.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/checker/MSAAProblemChecker.java
index d3a4e09..c124d3d 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/checker/MSAAProblemChecker.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/checker/MSAAProblemChecker.java
@@ -18,7 +18,6 @@
import org.eclipse.actf.accservice.swtbridge.AccessibleObject;
import org.eclipse.actf.accservice.swtbridge.IA2;
import org.eclipse.actf.accservice.swtbridge.MSAA;
-import org.eclipse.actf.model.flash.util.FlashMSAAUtil;
import org.eclipse.actf.visualization.gui.ui.views.MSAATreeContentProvider;
public class MSAAProblemChecker implements MSAAProblemConst {
@@ -54,9 +53,9 @@
int role = ao.getAccRole();
switch (role) {
case MSAA.ROLE_SYSTEM_WINDOW:
- if (FlashMSAAUtil.isFlash(ao.getPtr())) {
- isFlash = true;
- }
+// if (FlashMSAAUtil.isFlash(ao.getPtr())) {
+// isFlash = true;
+// }
break;
case MSAA.ROLE_SYSTEM_CELL:
case MSAA.ROLE_SYSTEM_STATICTEXT:
@@ -72,11 +71,11 @@
case MSAA.ROLE_SYSTEM_OUTLINE: // Ignore
break;
case MSAA.ROLE_SYSTEM_CLIENT:
- if (FlashMSAAUtil.isInvisibleFlash(ao.getPtr())) {
- problems.add(new MSAAProblem(MSAA_ERROR,
- MSAA_PROB_INVISIBLE_FLASH, ao));
- isFlash = true;
- }
+// if (FlashMSAAUtil.isInvisibleFlash(ao.getPtr())) {
+// problems.add(new MSAAProblem(MSAA_ERROR,
+// MSAA_PROB_INVISIBLE_FLASH, ao));
+// isFlash = true;
+// }
break;
default: {
if (null == accName || 0 == accName.length()) {
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/Accessible1PropertySource.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/Accessible1PropertySource.java
index da74126..78997bf 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/Accessible1PropertySource.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/Accessible1PropertySource.java
@@ -88,7 +88,7 @@
}
String strValue = null;
if( PID_HANDLE.equals(id) ) {
- strValue = "0x"+Integer.toHexString(accObject.getWindow()); //$NON-NLS-1$
+ strValue = "0x"+Long.toHexString(accObject.getWindow()); //$NON-NLS-1$
String wndClass = accObject.getClassName();
if (null!=wndClass && wndClass.length() > 0) {
strValue += " [" + wndClass + "]"; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/actions/WindowListAction.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/actions/WindowListAction.java
index 563be41..149a12f 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/actions/WindowListAction.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/actions/WindowListAction.java
@@ -147,7 +147,7 @@
public void widgetArmed(ArmEvent e) {
Object element = ((MenuItem) e.getSource()).getData();
if (null != element) {
- int hwnd = TargetWindow.getRootWindow(element);
+ long hwnd = TargetWindow.getRootWindow(element);
HighlightComposite.flashRectangle(WindowUtil
.GetWindowRectangle(hwnd));
}
@@ -158,7 +158,7 @@
public void widgetSelected(SelectionEvent event) {
TargetWindow.setCurrentElement(((MenuItem) event.getSource())
.getData());
- int hwnd = TargetWindow.getWindowHandle();
+ long hwnd = TargetWindow.getWindowHandle();
boolean isEmbedded = TargetWindow.isEmbeddedBrowser();
try {
if (setWindowOrder(GuiPreferenceManager
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAEventView.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAEventView.java
index 2f67ac6..284d916 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAEventView.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAEventView.java
@@ -336,7 +336,7 @@
}
}
- private void showEventInfo(int event, int hwnd, int idObject, int idChild,
+ private void showEventInfo(int event, long hwnd, int idObject, int idChild,
AccessibleObject accObject) {
if (text.isDisposed() || text.isFocusControl()) {
return;
@@ -574,7 +574,7 @@
lastTime = currentTime;
}
- public void handleEvent(final int event, final int hwnd,
+ public void handleEvent(final int event, final long hwnd,
final int idObject, final int idChild,
final AccessibleObject accObject) {
if (checkShowInfo(event, hwnd)) {
@@ -600,16 +600,16 @@
return enabledSet;
}
- private boolean checkShowInfo(int event, int hwnd) {
+ private boolean checkShowInfo(int event, long hwnd) {
boolean showInfo = false;
if (0 == MSAAViewRegistory.getUpdateRef()
&& null != MSAAViewRegistory.rootObject) {
if (null != MSAA.getEventTypeText(event)) {
- int hwndRoot = MSAAViewRegistory.rootObject.getWindow();
+ long hwndRoot = MSAAViewRegistory.rootObject.getWindow();
if (0 != hwndRoot) {
showInfo = MSAA.EVENT_OBJECT_FOCUS == event
&& WindowUtil.isPopupMenu(hwnd);
- for (int hwndParent = hwnd; !(showInfo || 0 == hwndParent); hwndParent = WindowUtil
+ for (long hwndParent = hwnd; !(showInfo || 0 == hwndParent); hwndParent = WindowUtil
.GetParentWindow(hwndParent)) {
showInfo = (hwndRoot == hwndParent);
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAOutlineView.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAOutlineView.java
index c924e1d..d76d1ca 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAOutlineView.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAOutlineView.java
@@ -16,7 +16,6 @@
import org.eclipse.actf.accservice.swtbridge.IA2;
import org.eclipse.actf.accservice.swtbridge.MSAA;
import org.eclipse.actf.accservice.swtbridge.ia2.Accessible2;
-import org.eclipse.actf.model.flash.util.FlashMSAAUtil;
import org.eclipse.actf.util.win32.HighlightComposite;
import org.eclipse.actf.util.win32.OverlayLabel;
import org.eclipse.actf.visualization.gui.IGuiViewIDs;
@@ -580,18 +579,18 @@
}
private Color getFlashBackground(AccessibleObject accObject) {
- switch (accObject.getAccRole()) {
- case MSAA.ROLE_SYSTEM_WINDOW:
- if (FlashMSAAUtil.isFlash(accObject.getPtr())) {
- return FLASH_COLOR;
- }
- break;
- case MSAA.ROLE_SYSTEM_CLIENT:
- if (FlashMSAAUtil.isInvisibleFlash(accObject.getPtr())) {
- return INVISIBLE_FLASH_COLOR;
- }
- break;
- }
+// switch (accObject.getAccRole()) {
+// case MSAA.ROLE_SYSTEM_WINDOW:
+// if (FlashMSAAUtil.isFlash(accObject.getPtr())) {
+// return FLASH_COLOR;
+// }
+// break;
+// case MSAA.ROLE_SYSTEM_CLIENT:
+// if (FlashMSAAUtil.isInvisibleFlash(accObject.getPtr())) {
+// return INVISIBLE_FLASH_COLOR;
+// }
+// break;
+// }
return null;
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAATreeContentProvider.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAATreeContentProvider.java
index 5206f9c..5c4e995 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAATreeContentProvider.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAATreeContentProvider.java
@@ -16,15 +16,9 @@
import java.util.Vector;
import org.eclipse.actf.accservice.swtbridge.AccessibleObject;
-import org.eclipse.actf.accservice.swtbridge.AccessibleObjectFactory;
import org.eclipse.actf.accservice.swtbridge.MSAA;
-import org.eclipse.actf.model.flash.util.FlashMSAAUtil;
-import org.eclipse.actf.util.win32.FlashMSAAObject;
-import org.eclipse.actf.util.win32.FlashMSAAObjectFactory;
-import org.eclipse.actf.util.win32.VariantUtil;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.ole.win32.Variant;
public class MSAATreeContentProvider implements ITreeContentProvider {
@@ -82,25 +76,25 @@
}
if (hideHtml) {
ArrayList<AccessibleObject> result = new ArrayList<AccessibleObject>();
- for (Object i : elements) {
- if (i instanceof AccessibleObject) {
-
- FlashMSAAObject msaaObject = FlashMSAAObjectFactory
- .getFlashMSAAObjectFromWindow(((AccessibleObject) i)
- .getWindow());
- FlashMSAAObject[] results = FlashMSAAUtil
- .getFlashElements(msaaObject);
- AccessibleObject[] flashElements = new AccessibleObject[results.length];
- for (int j = 0; j < results.length; j++) {
- Variant v = VariantUtil.createVariantFromIDispatchAddress(results[j].getPtr());
- flashElements[j] = AccessibleObjectFactory.getAccessibleObjectFromVariant(v);
- }
-
- for (AccessibleObject j : flashElements) {
- result.add(j);
- }
- }
- }
+// for (Object i : elements) {
+// if (i instanceof AccessibleObject) {
+//
+// FlashMSAAObject msaaObject = FlashMSAAObjectFactory
+// .getFlashMSAAObjectFromWindow(((AccessibleObject) i)
+// .getWindow());
+// FlashMSAAObject[] results = FlashMSAAUtil
+// .getFlashElements(msaaObject);
+// AccessibleObject[] flashElements = new AccessibleObject[results.length];
+// for (int j = 0; j < results.length; j++) {
+// Variant v = VariantUtil.createVariantFromIDispatchAddress(results[j].getPtr());
+// flashElements[j] = AccessibleObjectFactory.getAccessibleObjectFromVariant(v);
+// }
+//
+// for (AccessibleObject j : flashElements) {
+// result.add(j);
+// }
+// }
+// }
return result.toArray();
}
return elements;
@@ -136,6 +130,6 @@
public void setShowOffscreen(boolean showOffscreen) {
this.showOffscreen = showOffscreen;
- FlashMSAAUtil.setShowOffscreen(showOffscreen);
+// FlashMSAAUtil.setShowOffscreen(showOffscreen);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAViewRegistory.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAViewRegistory.java
index 28a882f..e45ded8 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAViewRegistory.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAViewRegistory.java
@@ -35,12 +35,12 @@
private static int updateRef = 0;
private static final Display display = Display.getCurrent();
- private static int hwndRoot = 0;
+ private static long hwndRoot = 0;
private static IPartListener2 partListener = new IPartListener2() {
public void partActivated(IWorkbenchPartReference partRef) {
if (partRef instanceof IEditorReference) {
if (TargetWindow.isEmbeddedBrowser()) {
- final int hwnd = TargetWindow.getRootWindow();
+ final long hwnd = TargetWindow.getRootWindow();
if (hwnd != hwndRoot) {
display
.timerExec(
diff --git a/plugins/org.eclipse.actf.visualization.lowvision/.classpath b/plugins/org.eclipse.actf.visualization.lowvision/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.lowvision/.classpath
+++ b/plugins/org.eclipse.actf.visualization.lowvision/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.lowvision/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.lowvision/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cec4180..0000000
--- a/plugins/org.eclipse.actf.visualization.lowvision/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:35:59 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.lowvision/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.lowvision/META-INF/MANIFEST.MF
index 8c46654..78c78ed 100644
--- a/plugins/org.eclipse.actf.visualization.lowvision/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.lowvision/META-INF/MANIFEST.MF
@@ -17,4 +17,5 @@
org.eclipse.actf.model.dom.dombycom,
org.eclipse.actf.util.vocab
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.lowvision
diff --git a/plugins/org.eclipse.actf.visualization.presentation/.classpath b/plugins/org.eclipse.actf.visualization.presentation/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/.classpath
+++ b/plugins/org.eclipse.actf.visualization.presentation/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.presentation/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.presentation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2cc92ec..0000000
--- a/plugins/org.eclipse.actf.visualization.presentation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:36:13 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF
index 4df062c..ce69a45 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF
@@ -15,4 +15,5 @@
org.eclipse.actf.ui
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.actf.visualization.presentation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.presentation
diff --git a/plugins/org.eclipse.actf.visualization.sdk/.classpath b/plugins/org.eclipse.actf.visualization.sdk/.classpath
index c835067..075009d 100644
--- a/plugins/org.eclipse.actf.visualization.sdk/.classpath
+++ b/plugins/org.eclipse.actf.visualization.sdk/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.sdk/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.sdk/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c7ed15..0000000
--- a/plugins/org.eclipse.actf.visualization.sdk/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Feb 02 19:30:20 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.ui.pdt/.classpath b/plugins/org.eclipse.actf.visualization.ui.pdt/.classpath
index 64c5e31..eca7bdb 100644
--- a/plugins/org.eclipse.actf.visualization.ui.pdt/.classpath
+++ b/plugins/org.eclipse.actf.visualization.ui.pdt/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.actf.visualization.ui.pdt/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.ui.pdt/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c7ed15..0000000
--- a/plugins/org.eclipse.actf.visualization.ui.pdt/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Feb 02 19:30:20 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.ui.pdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.ui.pdt/META-INF/MANIFEST.MF
index d57bb7b..e11e4b4 100644
--- a/plugins/org.eclipse.actf.visualization.ui.pdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.ui.pdt/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.eclipse.actf.visualization.ui.pdt;singleton:=true
Bundle-Version: 1.5.1.qualifier
Bundle-Vendor: Eclipse ACTF Project
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
@@ -12,3 +12,4 @@
org.eclipse.actf.visualization
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.actf.visualization.internal.ui.pdt.PdtVisualizationPlugin
+Automatic-Module-Name: org.eclipse.actf.visualization.ui.pdt
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/.classpath b/plugins/org.eclipse.actf.visualization.ui.report/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/.classpath
+++ b/plugins/org.eclipse.actf.visualization.ui.report/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.ui.report/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3007429..0000000
--- a/plugins/org.eclipse.actf.visualization.ui.report/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:36:31 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.ui.report/META-INF/MANIFEST.MF
index a2462c6..b243700 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.ui.report/META-INF/MANIFEST.MF
@@ -13,4 +13,5 @@
org.eclipse.actf.ui
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.actf.visualization.ui.report.table
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization.ui.report
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportViewActivator.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportViewActivator.java
index e43bb72..d5d7420 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportViewActivator.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportViewActivator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and Others
+ * Copyright (c) 2009, 2019 IBM Corporation and Others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -46,11 +46,13 @@
IWorkbenchPage page = PlatformUIUtil.getActivePage();
if (curResult != tmpResult && page != null) {
IViewPart view = page.findView(SummaryReportView.ID);
- IViewPart[] views = page.getViewStack(view);
- if (views != null && !(views[0] instanceof IACTFReportViewer)) {
- page.activate(view);
- if (event.getView() != null) {
- page.activate(event.getView());
+ if (view != null) {
+ IViewPart[] views = page.getViewStack(view);
+ if (views != null && !(views[0] instanceof IACTFReportViewer)) {
+ page.activate(view);
+ if (event.getView() != null) {
+ page.activate(event.getView());
+ }
}
}
}
diff --git a/plugins/org.eclipse.actf.visualization.ui.wst/.classpath b/plugins/org.eclipse.actf.visualization.ui.wst/.classpath
index c835067..075009d 100644
--- a/plugins/org.eclipse.actf.visualization.ui.wst/.classpath
+++ b/plugins/org.eclipse.actf.visualization.ui.wst/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization.ui.wst/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization.ui.wst/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c7ed15..0000000
--- a/plugins/org.eclipse.actf.visualization.ui.wst/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Feb 02 19:30:20 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization/.classpath b/plugins/org.eclipse.actf.visualization/.classpath
index 304e861..22f3064 100644
--- a/plugins/org.eclipse.actf.visualization/.classpath
+++ b/plugins/org.eclipse.actf.visualization/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.actf.visualization/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.visualization/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 584e550..0000000
--- a/plugins/org.eclipse.actf.visualization/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:33:24 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.visualization/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization/META-INF/MANIFEST.MF
index 76ce13f..e71599f 100644
--- a/plugins/org.eclipse.actf.visualization/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization/META-INF/MANIFEST.MF
@@ -11,4 +11,5 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.actf.mediator;visibility:=reexport
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.actf.visualization
