diff options
1679 files changed, 29889 insertions, 25973 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING index 94e8b826..a401d6e8 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -17,7 +17,23 @@ Information regarding source code management, builds, coding standards, and more - https://projects.eclipse.org/projects/modeling.mmt.atl/developer -Contributor License Agreement: +Anonymous read-only access to the git repository: + + git clone git://git.eclipse.org/gitroot/mmt/org.eclipse.atl.git + +- or - + + git clone https://git.eclipse.org/r/mmt/org.eclipse.atl + +Read/write access to the git repository for committers: + + git clone ssh://<user_id>@git.eclipse.org:29418/mmt/org.eclipse.atl + +The project uses Maven for its main build. You can build the project as follows: + + mvn -f releng/org.eclipse.m2m.atl.releng.parent/pom.xml clean verify + +Eclipse Contributor Agreement: ------------------------------ Before your contribution can be accepted by the project, you need to create and electronically sign the Eclipse Contributor Agreement (ECA). diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..e23ece2c --- /dev/null +++ b/LICENSE @@ -0,0 +1,277 @@ +Eclipse Public License - v 2.0 + + 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. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + 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 changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"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. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + + 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. + + 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. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). + +3. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other 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; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. + +4. COMMERCIAL DISTRIBUTION + +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. + +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. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, 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. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, 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. + +7. GENERAL + +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. + +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. + +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. + +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. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership.
\ No newline at end of file @@ -0,0 +1,140 @@ +Eclipse Foundation Software User Agreement + +November 22, 2017 + +Usage Of Content + +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. + +Applicable Licenses + +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 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL, +"Program" will mean the Content. + +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"). + +- 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"). +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR + (Java\u2122 ARchive) in a directory named "plugins". +- 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. +- 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. + +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: + +- The top-level (root) directory +- Plug-in and Fragment directories +- Inside Plug-ins and Fragments packaged as JARs +- Sub-directories of the directory named "src" of certain Plug-ins +- Feature directories + +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. + +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): + +- Eclipse Public License Version 1.0 (available at + http://www.eclipse.org/legal/epl-v10.html) +- Eclipse Distribution License Version 1.0 (available at + http://www.eclipse.org/licenses/edl-v1.0.html) +- Common Public License Version 1.0 (available at + http://www.eclipse.org/legal/cpl-v10.html) +- Apache Software License 1.1 (available at + http://www.apache.org/licenses/LICENSE) +- Apache Software License 2.0 (available at + http://www.apache.org/licenses/LICENSE-2.0) +- Mozilla Public License Version 1.1 (available at + http://www.mozilla.org/MPL/MPL-1.1.html) + +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. + +Use of Provisioning Technology + +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 +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification"). + +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: + +1. 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. +2. 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. +3. 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. + +Cryptography + +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. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the +United States, other countries, or both. diff --git a/doc/org.eclipse.m2m.atl.cheatsheets/.settings/org.eclipse.jdt.ui.prefs b/doc/org.eclipse.m2m.atl.cheatsheets/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/doc/org.eclipse.m2m.atl.cheatsheets/.settings/org.eclipse.jdt.ui.prefs +++ b/doc/org.eclipse.m2m.atl.cheatsheets/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/doc/org.eclipse.m2m.atl.cheatsheets/META-INF/MANIFEST.MF b/doc/org.eclipse.m2m.atl.cheatsheets/META-INF/MANIFEST.MF index f4bbccd2..422d670b 100644 --- a/doc/org.eclipse.m2m.atl.cheatsheets/META-INF/MANIFEST.MF +++ b/doc/org.eclipse.m2m.atl.cheatsheets/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.cheatsheets;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ClassPath: . diff --git a/doc/org.eclipse.m2m.atl.cheatsheets/about.html b/doc/org.eclipse.m2m.atl.cheatsheets/about.html index c9143d21..044c0c86 100644 --- a/doc/org.eclipse.m2m.atl.cheatsheets/about.html +++ b/doc/org.eclipse.m2m.atl.cheatsheets/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>December 7, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/doc/org.eclipse.m2m.atl.cheatsheets/pom.xml b/doc/org.eclipse.m2m.atl.cheatsheets/pom.xml index ab4d17ff..c0ec98ac 100644 --- a/doc/org.eclipse.m2m.atl.cheatsheets/pom.xml +++ b/doc/org.eclipse.m2m.atl.cheatsheets/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.cheatsheets</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/doc/org.eclipse.m2m.atl.cheatsheets/src/org/eclipse/m2m/atl/cheatsheets/Family2PersonCheatsheet.java b/doc/org.eclipse.m2m.atl.cheatsheets/src/org/eclipse/m2m/atl/cheatsheets/Family2PersonCheatsheet.java index 14d45e07..4eebaa9d 100644 --- a/doc/org.eclipse.m2m.atl.cheatsheets/src/org/eclipse/m2m/atl/cheatsheets/Family2PersonCheatsheet.java +++ b/doc/org.eclipse.m2m.atl.cheatsheets/src/org/eclipse/m2m/atl/cheatsheets/Family2PersonCheatsheet.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL cheatsheets plugin diff --git a/doc/org.eclipse.m2m.atl.doc-feature/build.properties b/doc/org.eclipse.m2m.atl.doc-feature/build.properties index 5ea5848e..5c0d7033 100644 --- a/doc/org.eclipse.m2m.atl.doc-feature/build.properties +++ b/doc/org.eclipse.m2m.atl.doc-feature/build.properties @@ -4,11 +4,11 @@ bin.includes = feature.properties,\ license.html,\ eclipse_update_120.jpg,\ modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ eclipse.gif src.includes = license.html,\ feature.xml,\ feature.properties,\ - epl-v10.html,\ + epl-v20.html,\ eclipse_update_120.jpg,\ modeling32.png diff --git a/doc/org.eclipse.m2m.atl.doc-feature/copyright.txt b/doc/org.eclipse.m2m.atl.doc-feature/copyright.txt index a6a0f3f3..25921105 100644 --- a/doc/org.eclipse.m2m.atl.doc-feature/copyright.txt +++ b/doc/org.eclipse.m2m.atl.doc-feature/copyright.txt @@ -1,8 +1,8 @@ Copyright (c) 2008, 2012 Obeo. All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial API and implementation
\ No newline at end of file diff --git a/doc/org.eclipse.m2m.atl.doc-feature/epl-v10.html b/doc/org.eclipse.m2m.atl.doc-feature/epl-v10.html deleted file mode 100644 index f957f3e7..00000000 --- a/doc/org.eclipse.m2m.atl.doc-feature/epl-v10.html +++ /dev/null @@ -1,259 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- saved from url=(0041)http://www.eclipse.org/legal/epl-v10.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -<style type="text/css"></style></head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to 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.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - - - -</body></html>
\ No newline at end of file diff --git a/doc/org.eclipse.m2m.atl.doc-feature/epl-v20.html b/doc/org.eclipse.m2m.atl.doc-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/doc/org.eclipse.m2m.atl.doc-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/doc/org.eclipse.m2m.atl.doc-feature/feature.properties b/doc/org.eclipse.m2m.atl.doc-feature/feature.properties index f675c92a..634384b1 100644 --- a/doc/org.eclipse.m2m.atl.doc-feature/feature.properties +++ b/doc/org.eclipse.m2m.atl.doc-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2007 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 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * IBM - Initial API and implementation @@ -36,9 +36,9 @@ description = Documentation for ATL. copyrightURL=copyright.txt copyright=Copyright (c) 2008, 2012 Obeo.\n\ All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ +https://www.eclipse.org/legal/epl-2.0/\n\ \n\ Contributors:\n\ Obeo - initial API and implementation @@ -54,125 +54,143 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 9, 2014\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## diff --git a/doc/org.eclipse.m2m.atl.doc-feature/feature.xml b/doc/org.eclipse.m2m.atl.doc-feature/feature.xml index 841b5dc7..02fed053 100644 --- a/doc/org.eclipse.m2m.atl.doc-feature/feature.xml +++ b/doc/org.eclipse.m2m.atl.doc-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.m2m.atl.doc" label="%featureName" - version="4.1.0.qualifier" + version="4.10.0.qualifier" provider-name="%providerName"> <description> @@ -20,10 +20,6 @@ <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> </url> - <requires> - <import plugin="org.eclipse.help"/> - </requires> - <plugin id="org.eclipse.m2m.atl.doc" download-size="0" diff --git a/doc/org.eclipse.m2m.atl.doc-feature/license.html b/doc/org.eclipse.m2m.atl.doc-feature/license.html index cecf137d..afb2f35c 100644 --- a/doc/org.eclipse.m2m.atl.doc-feature/license.html +++ b/doc/org.eclipse.m2m.atl.doc-feature/license.html @@ -1,106 +1,190 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<?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> -<style type="text/css"></style></head> +</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>
\ No newline at end of file + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/doc/org.eclipse.m2m.atl.doc-feature/pom.xml b/doc/org.eclipse.m2m.atl.doc-feature/pom.xml index 117b1004..0c1e76ad 100644 --- a/doc/org.eclipse.m2m.atl.doc-feature/pom.xml +++ b/doc/org.eclipse.m2m.atl.doc-feature/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl.features</groupId> <artifactId>org.eclipse.m2m.atl.doc</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/doc/org.eclipse.m2m.atl.doc/.gitignore b/doc/org.eclipse.m2m.atl.doc/.gitignore index 6f7f420d..5ceaeb37 100644 --- a/doc/org.eclipse.m2m.atl.doc/.gitignore +++ b/doc/org.eclipse.m2m.atl.doc/.gitignore @@ -1 +1,2 @@ tmp
+/Reference-toc.xml diff --git a/doc/org.eclipse.m2m.atl.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.m2m.atl.doc/META-INF/MANIFEST.MF index cf158fbc..8ffe5012 100644 --- a/doc/org.eclipse.m2m.atl.doc/META-INF/MANIFEST.MF +++ b/doc/org.eclipse.m2m.atl.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.doc; singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.help diff --git a/doc/org.eclipse.m2m.atl.doc/about.html b/doc/org.eclipse.m2m.atl.doc/about.html index d35d5aed..7dfc52a2 100644 --- a/doc/org.eclipse.m2m.atl.doc/about.html +++ b/doc/org.eclipse.m2m.atl.doc/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 5, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/doc/org.eclipse.m2m.atl.doc/about.properties b/doc/org.eclipse.m2m.atl.doc/about.properties index e6e274ad..d4f4b135 100644 --- a/doc/org.eclipse.m2m.atl.doc/about.properties +++ b/doc/org.eclipse.m2m.atl.doc/about.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002-2005 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 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * IBM - Initial API and implementation diff --git a/doc/org.eclipse.m2m.atl.doc/build.properties b/doc/org.eclipse.m2m.atl.doc/build.properties index 1b77166c..d236f256 100644 --- a/doc/org.eclipse.m2m.atl.doc/build.properties +++ b/doc/org.eclipse.m2m.atl.doc/build.properties @@ -15,6 +15,7 @@ bin.includes = plugin.xml,\ eclipse_lg.gif,\ plugin.properties,\ toc.xml,\ + Reference-toc.xml,\ eclipse32.gif,\ guide/,\ tutorials/,\ diff --git a/doc/org.eclipse.m2m.atl.doc/build/overview.html b/doc/org.eclipse.m2m.atl.doc/build/overview.html index 310a1d85..bde1bd8b 100644 --- a/doc/org.eclipse.m2m.atl.doc/build/overview.html +++ b/doc/org.eclipse.m2m.atl.doc/build/overview.html @@ -8,9 +8,9 @@ * * Copyright (c) 2007 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM - Initial API and implementation diff --git a/doc/org.eclipse.m2m.atl.doc/plugin.xml b/doc/org.eclipse.m2m.atl.doc/plugin.xml index 97535ea8..cd55dcda 100644 --- a/doc/org.eclipse.m2m.atl.doc/plugin.xml +++ b/doc/org.eclipse.m2m.atl.doc/plugin.xml @@ -24,14 +24,52 @@ file="guide/tutorials/ATL Tutorials-toc.xml" primary="false"> </toc> + <toc + file="Reference-toc.xml" + primary="false"> + </toc> </extension> <!-- ============================================================================= --> <!-- Define Javadoc locations --> <!-- ============================================================================= --> <extension point="org.eclipse.pde.core.javadoc"> - <javadoc path="doc.zip!/references/javadoc" archive="true"> - <plugin id="org.eclipse.m2m.atl.common"/> + <javadoc path="references/javadoc"> + <plugin id="org.eclipse.m2m.atl.adt"/> + <plugin id="org.eclipse.m2m.atl.adt.debug"/> + <plugin id="org.eclipse.m2m.atl.adt.editor"/> + <plugin id="org.eclipse.m2m.atl.adt.ui"/> + <plugin id="org.eclipse.m2m.atl.common"/> + <plugin id="org.eclipse.m2m.atl.core"/> + <plugin id="org.eclipse.m2m.atl.core.ant"/> + <plugin id="org.eclipse.m2m.atl.core.emf"/> + <plugin id="org.eclipse.m2m.atl.core.ui"/> + <plugin id="org.eclipse.m2m.atl.core.ui.vm"/> + <plugin id="org.eclipse.m2m.atl.debug.core"/> + <plugin id="org.eclipse.m2m.atl.drivers.emf4atl"/> + <plugin id="org.eclipse.m2m.atl.drivers.uml24atl"/> + <plugin id="org.eclipse.m2m.atl.dsls"/> + <plugin id="org.eclipse.m2m.atl.emftvm"/> + <plugin id="org.eclipse.m2m.atl.emftvm.ant"/> + <plugin id="org.eclipse.m2m.atl.emftvm.cdo"/> + <plugin id="org.eclipse.m2m.atl.emftvm.compiler"/> + <plugin id="org.eclipse.m2m.atl.emftvm.edit"/> + <plugin id="org.eclipse.m2m.atl.emftvm.editor"/> + <plugin id="org.eclipse.m2m.atl.emftvm.launcher"/> + <plugin id="org.eclipse.m2m.atl.emftvm.trace"/> + <plugin id="org.eclipse.m2m.atl.emftvm.trace.edit"/> + <plugin id="org.eclipse.m2m.atl.emftvm.trace.editor"/> + <plugin id="org.eclipse.m2m.atl.engine"/> + <plugin id="org.eclipse.m2m.atl.engine.emfvm"/> + <plugin id="org.eclipse.m2m.atl.engine.emfvm.launch"/> + <plugin id="org.eclipse.m2m.atl.engine.vm"/> + <plugin id="org.eclipse.m2m.atl.profiler.core"/> + <plugin id="org.eclipse.m2m.atl.profiler.emfvm"/> + <plugin id="org.eclipse.m2m.atl.profiler.exportmodel"/> + <plugin id="org.eclipse.m2m.atl.profiler.exportmodel.editor"/> + <plugin id="org.eclipse.m2m.atl.profiler.model"/> + <plugin id="org.eclipse.m2m.atl.profiler.ui"/> + <plugin id="org.eclipse.m2m.atl.profiler.vm"/> </javadoc> </extension> diff --git a/doc/org.eclipse.m2m.atl.doc/pom.xml b/doc/org.eclipse.m2m.atl.doc/pom.xml index 60b2c1f5..9206359e 100644 --- a/doc/org.eclipse.m2m.atl.doc/pom.xml +++ b/doc/org.eclipse.m2m.atl.doc/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,215 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.doc</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-document-bundle-plugin</artifactId> + <executions> + <execution> + <id>plugin-javadoc</id> + <goals> + <goal>javadoc</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/../references/javadoc</outputDirectory> + <tocFile>${project.build.directory}/../Reference-toc.xml</tocFile> + <javadocOptions> + <ignoreError>true</ignoreError> + <encoding>UTF-8</encoding> + </javadocOptions> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.adt</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.adt.debug</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.adt.editor</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.adt.ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.core.ant</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.core.emf</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.core.ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.core.ui.vm</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.debug.core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.drivers.emf4atl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.drivers.uml24atl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.dsls</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.ant</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.cdo</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.compiler</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.edit</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.editor</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.launcher</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.trace</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.trace.edit</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.trace.editor</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.engine</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.engine.emfvm</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.engine.emfvm.launch</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.engine.vm</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.profiler.core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.profiler.emfvm</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.profiler.exportmodel</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.profiler.exportmodel.editor</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.profiler.model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.profiler.ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.profiler.vm</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </project> diff --git a/doc/org.eclipse.m2m.atl.doc/references/.gitignore b/doc/org.eclipse.m2m.atl.doc/references/.gitignore new file mode 100644 index 00000000..1910f62b --- /dev/null +++ b/doc/org.eclipse.m2m.atl.doc/references/.gitignore @@ -0,0 +1 @@ +/javadoc/ diff --git a/doc/org.eclipse.m2m.atl.doc/references/PLACEHOLDER b/doc/org.eclipse.m2m.atl.doc/references/PLACEHOLDER deleted file mode 100644 index e69de29b..00000000 --- a/doc/org.eclipse.m2m.atl.doc/references/PLACEHOLDER +++ /dev/null diff --git a/doc/org.eclipse.m2m.atl.doc/toc.xml b/doc/org.eclipse.m2m.atl.doc/toc.xml index 0564ad6f..4e1f8ef4 100644 --- a/doc/org.eclipse.m2m.atl.doc/toc.xml +++ b/doc/org.eclipse.m2m.atl.doc/toc.xml @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <?NLS TYPE="org.eclipse.help.toc"?> - <toc label="ATL Guide"> - <topic href="guide/concepts/ATL Concepts.html" label="Concepts"> - <link toc="guide/concepts/ATL Concepts-toc.xml"/> - </topic> - <topic href="guide/user/ATL User Guide.html" label="User Guide"> - <link toc="guide/user/ATL User Guide-toc.xml"/> - </topic> - <topic href="guide/developer/ATL Developer Guide.html" label="Developer Guide"> - <link toc="guide/developer/ATL Developer Guide-toc.xml"/> - </topic> - <topic href="guide/tutorials/ATL Tutorials.html" label="Tutorials"> - <link toc="guide/tutorials/ATL Tutorials-toc.xml"/> - </topic> + <topic href="guide/concepts/ATL Concepts.html" label="Concepts"> + <link toc="guide/concepts/ATL Concepts-toc.xml"/> + </topic> + <topic href="guide/user/ATL User Guide.html" label="User Guide"> + <link toc="guide/user/ATL User Guide-toc.xml"/> + </topic> + <topic href="guide/developer/ATL Developer Guide.html" label="Developer Guide"> + <link toc="guide/developer/ATL Developer Guide-toc.xml"/> + </topic> + <topic href="guide/tutorials/ATL Tutorials.html" label="Tutorials"> + <link toc="guide/tutorials/ATL Tutorials-toc.xml"/> + </topic> <topic label="Online Docs"> <topic label="ATL wiki" href="http://wiki.eclipse.org/index.php/ATL" /> <topic label="ATL basic examples" href="http://www.eclipse.org/m2m/atl/basicExamples_Patterns/" /> <topic label="ATL use cases" href="http://www.eclipse.org/m2m/atl/usecases/" /> <topic label="ATL transformation zoo" href="http://www.eclipse.org/m2m/atl/atlTransformations/" /> </topic> - <anchor id="additions"/> + <link toc="Reference-toc.xml"/> + <anchor id="additions"/> </toc> diff --git a/dsls/ACG/.settings/org.eclipse.core.resources.prefs b/dsls/ACG/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..b3e2d822 --- /dev/null +++ b/dsls/ACG/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Thu Dec 05 18:14:30 CET 2019 +eclipse.preferences.version=1 +encoding//Syntax/ACG.tcs=UTF-8 diff --git a/dsls/ACG/Syntax/ACG.tcs b/dsls/ACG/Syntax/ACG.tcs index 7ce00491..b7437ad2 100644 --- a/dsls/ACG/Syntax/ACG.tcs +++ b/dsls/ACG/Syntax/ACG.tcs @@ -1,4 +1,4 @@ --- @authors Frédéric Jouault +-- @authors Frédéric Jouault -- @date 2007/07/25 -- @description This TCS model defines the syntax of the ACG language. syntax ACG { @@ -430,7 +430,6 @@ syntax ACG { } token COMMENT : endOfLine(start = "--"); - token STRING : multiLine(start = "\'", end = "\'", esc = "\\"); lexer = " NL @@ -476,12 +475,12 @@ NAME : ( %v3 SNAME %v2 s:SNAME {if(s.getType() != SNAME) $setType(s.getType());} - | '\"'! + | '\"' ( ESC | '\\n' {newline();} | ~('\\\\'|'\\\"'|'\\n') )* - '\"'! + '\"' %v3 {setText(ei.unescapeString(getText(), 1));} ) ; @@ -495,7 +494,7 @@ INT %protected ESC - : '\\\\'! + : '\\\\' ( 'n' %v2{%setText(\"\\n\");} | 'r' %v2{%setText(\"\\r\");} | 't' %v2{%setText(\"\\t\");} @@ -538,6 +537,13 @@ ESC } ) ; +STRING @init {} + : (('\\'' (options {greedy = false;} : (('\\\\' ~ '\\n')| '\\n'| ~('\\\\'| '\\n')))* '\\'')) + { + + } + + ; "; } diff --git a/dsls/ATL/.settings/org.eclipse.core.resources.prefs b/dsls/ATL/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..4d9adf9f --- /dev/null +++ b/dsls/ATL/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Thu Dec 05 18:14:45 CET 2019 +eclipse.preferences.version=1 +encoding//Syntax/ATL.tcs=UTF-8 diff --git a/dsls/ATL/Syntax/ATL.tcs b/dsls/ATL/Syntax/ATL.tcs index 72d7208b..c7e8bac0 100644 --- a/dsls/ATL/Syntax/ATL.tcs +++ b/dsls/ATL/Syntax/ATL.tcs @@ -1,4 +1,4 @@ --- @authors Frédéric Jouault +-- @authors Frédéric Jouault -- @date 2007/07/26 -- @description This TCS model defines the syntax of the ATL language. @@ -529,7 +529,7 @@ syntax ATL(k = 0) { } token COMMENT : endOfLine(start = "--"); - token STRING : multiLine(start = "\'", end = "\'", esc = "\\"); +-- token STRING : multiLine(start = "\'", end = "\'", esc = "\\"); lexer = " %options testLiterals = false; @@ -578,12 +578,12 @@ NAME : ( %v3 SNAME %v2 s:SNAME {if(s.getType() != SNAME) $setType(s.getType());} - | '\"'! + | '\"' ( ESC | '\\n' {newline();} | ~('\\\\'|'\\\"'|'\\n') )* - '\"'! + '\"' %v3 {setText(ei.unescapeString(getText(), 1));} ) ; @@ -598,7 +598,7 @@ INT %protected ESC - : '\\\\'! + : '\\\\' ( 'n' %v2{%setText(\"\\n\");} | 'r' %v2{%setText(\"\\r\");} | 't' %v2{%setText(\"\\t\");} @@ -641,6 +641,13 @@ ESC } ) ; +STRING @init {} + : (('\\'' (options {greedy = false;} : (('\\\\' ~ '\\n')| '\\n'| ~('\\\\'| '\\n')))* '\\'')) + { + + } + + ; "; } diff --git a/examples/org.eclipse.m2m.atl.examples-feature/build.properties b/examples/org.eclipse.m2m.atl.examples-feature/build.properties index 187c5450..643ed636 100644 --- a/examples/org.eclipse.m2m.atl.examples-feature/build.properties +++ b/examples/org.eclipse.m2m.atl.examples-feature/build.properties @@ -4,10 +4,10 @@ bin.includes = feature.properties,\ license.html,\ eclipse_update_120.jpg,\ modeling32.png,\ - epl-v10.html + epl-v20.html src.includes = license.html,\ feature.xml,\ feature.properties,\ - epl-v10.html,\ + epl-v20.html,\ eclipse_update_120.jpg,\ modeling32.png diff --git a/examples/org.eclipse.m2m.atl.examples-feature/copyright.txt b/examples/org.eclipse.m2m.atl.examples-feature/copyright.txt index a6a0f3f3..25921105 100644 --- a/examples/org.eclipse.m2m.atl.examples-feature/copyright.txt +++ b/examples/org.eclipse.m2m.atl.examples-feature/copyright.txt @@ -1,8 +1,8 @@ Copyright (c) 2008, 2012 Obeo. All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial API and implementation
\ No newline at end of file diff --git a/examples/org.eclipse.m2m.atl.examples-feature/epl-v10.html b/examples/org.eclipse.m2m.atl.examples-feature/epl-v10.html deleted file mode 100644 index f957f3e7..00000000 --- a/examples/org.eclipse.m2m.atl.examples-feature/epl-v10.html +++ /dev/null @@ -1,259 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- saved from url=(0041)http://www.eclipse.org/legal/epl-v10.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -<style type="text/css"></style></head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to 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.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - - - -</body></html>
\ No newline at end of file diff --git a/examples/org.eclipse.m2m.atl.examples-feature/epl-v20.html b/examples/org.eclipse.m2m.atl.examples-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/examples/org.eclipse.m2m.atl.examples-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/examples/org.eclipse.m2m.atl.examples-feature/feature.properties b/examples/org.eclipse.m2m.atl.examples-feature/feature.properties index e777b7bb..4a9d36f4 100644 --- a/examples/org.eclipse.m2m.atl.examples-feature/feature.properties +++ b/examples/org.eclipse.m2m.atl.examples-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2007 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 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * IBM - Initial API and implementation @@ -36,9 +36,9 @@ description = Example illustrating how to use ATL. copyrightURL=copyright.txt copyright=Copyright (c) 2008, 2012 Obeo.\n\ All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ +https://www.eclipse.org/legal/epl-2.0/\n\ \n\ Contributors:\n\ Obeo - initial API and implementation @@ -54,127 +54,143 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 9, 2014\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## - - diff --git a/examples/org.eclipse.m2m.atl.examples-feature/feature.xml b/examples/org.eclipse.m2m.atl.examples-feature/feature.xml index 31849541..7271de28 100644 --- a/examples/org.eclipse.m2m.atl.examples-feature/feature.xml +++ b/examples/org.eclipse.m2m.atl.examples-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.m2m.atl.examples" label="%featureName" - version="4.1.0.qualifier" + version="4.10.0.qualifier" provider-name="%providerName"> <description> diff --git a/examples/org.eclipse.m2m.atl.examples-feature/license.html b/examples/org.eclipse.m2m.atl.examples-feature/license.html index cecf137d..afb2f35c 100644 --- a/examples/org.eclipse.m2m.atl.examples-feature/license.html +++ b/examples/org.eclipse.m2m.atl.examples-feature/license.html @@ -1,106 +1,190 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<?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> -<style type="text/css"></style></head> +</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>
\ No newline at end of file + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/examples/org.eclipse.m2m.atl.examples-feature/pom.xml b/examples/org.eclipse.m2m.atl.examples-feature/pom.xml index 5aa6feb6..d95907b1 100644 --- a/examples/org.eclipse.m2m.atl.examples-feature/pom.xml +++ b/examples/org.eclipse.m2m.atl.examples-feature/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -15,12 +15,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl.features</groupId> <artifactId>org.eclipse.m2m.atl.examples</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/examples/org.eclipse.m2m.atl.examples.public2private.cmd/about.html b/examples/org.eclipse.m2m.atl.examples.public2private.cmd/about.html index b6380d4b..044c0c86 100644 --- a/examples/org.eclipse.m2m.atl.examples.public2private.cmd/about.html +++ b/examples/org.eclipse.m2m.atl.examples.public2private.cmd/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>September 1, 2005</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/examples/org.eclipse.m2m.atl.examples.public2private.cmd/src/org/eclipse/m2m/atl/examples/public2private/cmd/Main.java b/examples/org.eclipse.m2m.atl.examples.public2private.cmd/src/org/eclipse/m2m/atl/examples/public2private/cmd/Main.java index cf763e32..8e07b5ae 100644 --- a/examples/org.eclipse.m2m.atl.examples.public2private.cmd/src/org/eclipse/m2m/atl/examples/public2private/cmd/Main.java +++ b/examples/org.eclipse.m2m.atl.examples.public2private.cmd/src/org/eclipse/m2m/atl/examples/public2private/cmd/Main.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2009 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Public2Private standalone example diff --git a/examples/org.eclipse.m2m.atl.examples.public2private.ui/.settings/org.eclipse.jdt.ui.prefs b/examples/org.eclipse.m2m.atl.examples.public2private.ui/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/examples/org.eclipse.m2m.atl.examples.public2private.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/examples/org.eclipse.m2m.atl.examples.public2private.ui/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/examples/org.eclipse.m2m.atl.examples.public2private.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.m2m.atl.examples.public2private.ui/META-INF/MANIFEST.MF index a555d94d..8cc2b93a 100644 --- a/examples/org.eclipse.m2m.atl.examples.public2private.ui/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.m2m.atl.examples.public2private.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.examples.public2private.ui;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.ui, org.eclipse.core.resources, diff --git a/examples/org.eclipse.m2m.atl.examples.public2private.ui/about.html b/examples/org.eclipse.m2m.atl.examples.public2private.ui/about.html index b6380d4b..044c0c86 100644 --- a/examples/org.eclipse.m2m.atl.examples.public2private.ui/about.html +++ b/examples/org.eclipse.m2m.atl.examples.public2private.ui/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>September 1, 2005</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/examples/org.eclipse.m2m.atl.examples.public2private.ui/src/org/eclipse/m2m/atl/examples/public2private/ui/PrivatizeAction.java b/examples/org.eclipse.m2m.atl.examples.public2private.ui/src/org/eclipse/m2m/atl/examples/public2private/ui/PrivatizeAction.java index d3a838cb..2737384d 100644 --- a/examples/org.eclipse.m2m.atl.examples.public2private.ui/src/org/eclipse/m2m/atl/examples/public2private/ui/PrivatizeAction.java +++ b/examples/org.eclipse.m2m.atl.examples.public2private.ui/src/org/eclipse/m2m/atl/examples/public2private/ui/PrivatizeAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Public2Private example IDE diff --git a/examples/org.eclipse.m2m.atl.examples.public2private/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.m2m.atl.examples.public2private/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..a046ef04 --- /dev/null +++ b/examples/org.eclipse.m2m.atl.examples.public2private/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,15 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/examples/org.eclipse.m2m.atl.examples.public2private/META-INF/MANIFEST.MF b/examples/org.eclipse.m2m.atl.examples.public2private/META-INF/MANIFEST.MF index dbadce8e..e9a01f11 100644 --- a/examples/org.eclipse.m2m.atl.examples.public2private/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.m2m.atl.examples.public2private/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.examples.public2private -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.uml2.uml diff --git a/examples/org.eclipse.m2m.atl.examples.public2private/about.html b/examples/org.eclipse.m2m.atl.examples.public2private/about.html index b6380d4b..044c0c86 100644 --- a/examples/org.eclipse.m2m.atl.examples.public2private/about.html +++ b/examples/org.eclipse.m2m.atl.examples.public2private/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>September 1, 2005</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/examples/org.eclipse.m2m.atl.examples/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.m2m.atl.examples/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..a046ef04 --- /dev/null +++ b/examples/org.eclipse.m2m.atl.examples/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,15 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/examples/org.eclipse.m2m.atl.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.m2m.atl.examples/META-INF/MANIFEST.MF index c20ee962..5bf94db6 100644 --- a/examples/org.eclipse.m2m.atl.examples/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.m2m.atl.examples/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.examples;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ClassPath: . diff --git a/examples/org.eclipse.m2m.atl.examples/about.html b/examples/org.eclipse.m2m.atl.examples/about.html index c258ef55..044c0c86 100644 --- a/examples/org.eclipse.m2m.atl.examples/about.html +++ b/examples/org.eclipse.m2m.atl.examples/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 5, 2006</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/examples/org.eclipse.m2m.atl.examples/about.properties b/examples/org.eclipse.m2m.atl.examples/about.properties index f6bd0279..5a36ed84 100644 --- a/examples/org.eclipse.m2m.atl.examples/about.properties +++ b/examples/org.eclipse.m2m.atl.examples/about.properties @@ -13,9 +13,9 @@ Build id: {0}\n\ \n\ Copyright (c) 2008, 2012 Obeo.\n\ All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ # ============================================================================== # %%% END OF TRANSLATED PROPERTIES %%% # The above properties have been shipped for translation. diff --git a/examples/org.eclipse.m2m.atl.examples/build.xml b/examples/org.eclipse.m2m.atl.examples/build.xml index 3360f10b..383b9183 100644 --- a/examples/org.eclipse.m2m.atl.examples/build.xml +++ b/examples/org.eclipse.m2m.atl.examples/build.xml @@ -4,9 +4,9 @@ Copyright (c) 2008, 2012 Obeo All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial API and implementation diff --git a/examples/org.eclipse.m2m.atl.examples/pom.xml b/examples/org.eclipse.m2m.atl.examples/pom.xml index 9d6c1ddc..4dfaaceb 100644 --- a/examples/org.eclipse.m2m.atl.examples/pom.xml +++ b/examples/org.eclipse.m2m.atl.examples/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.examples</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/ATLExamplesPlugin.java b/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/ATLExamplesPlugin.java index 6477e636..122f2e0b 100644 --- a/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/ATLExamplesPlugin.java +++ b/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/ATLExamplesPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/AbstractExampleWizard.java b/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/AbstractExampleWizard.java index 4b70aeaf..9eefbd62 100644 --- a/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/AbstractExampleWizard.java +++ b/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/AbstractExampleWizard.java @@ -3,9 +3,9 @@ * * Copyright (c) 2006, 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM - Initial API and implementation diff --git a/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/Public2PrivateExampleWizard.java b/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/Public2PrivateExampleWizard.java index 4f525e04..78ac32e4 100644 --- a/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/Public2PrivateExampleWizard.java +++ b/examples/org.eclipse.m2m.atl.examples/src/org/eclipse/m2m/atl/examples/Public2PrivateExampleWizard.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl-feature/about.html b/plugins/org.eclipse.m2m.atl-feature/about.html index 2b9bcfbe..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl-feature/about.html +++ b/plugins/org.eclipse.m2m.atl-feature/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>May 30, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl-feature/build.properties b/plugins/org.eclipse.m2m.atl-feature/build.properties index ec39ead8..3fad5d41 100644 --- a/plugins/org.eclipse.m2m.atl-feature/build.properties +++ b/plugins/org.eclipse.m2m.atl-feature/build.properties @@ -1,20 +1,20 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation ################################################################################ bin.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ license.html src.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ license.html diff --git a/plugins/org.eclipse.m2m.atl-feature/copyright.txt b/plugins/org.eclipse.m2m.atl-feature/copyright.txt index b80ba12c..bb0df23a 100644 --- a/plugins/org.eclipse.m2m.atl-feature/copyright.txt +++ b/plugins/org.eclipse.m2m.atl-feature/copyright.txt @@ -1,5 +1,5 @@ Copyright (c) 2004, 2009 INRIA. All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ diff --git a/plugins/org.eclipse.m2m.atl-feature/epl-v10.html b/plugins/org.eclipse.m2m.atl-feature/epl-v10.html deleted file mode 100644 index f957f3e7..00000000 --- a/plugins/org.eclipse.m2m.atl-feature/epl-v10.html +++ /dev/null @@ -1,259 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- saved from url=(0041)http://www.eclipse.org/legal/epl-v10.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -<style type="text/css"></style></head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to 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.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - - - -</body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl-feature/feature.properties b/plugins/org.eclipse.m2m.atl-feature/feature.properties index 7bc0f09f..4e03e08e 100644 --- a/plugins/org.eclipse.m2m.atl-feature/feature.properties +++ b/plugins/org.eclipse.m2m.atl-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002, 2009 ATLAS Group (INRIA & LINA). # * All rights reserved. This program and the accompanying materials -# * are made available under the terms of the Eclipse Public License v1.0 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * ATLAS Group (INRIA & LINA) @@ -35,7 +35,7 @@ featureName = ATL - ATL Transformation Language providerName = Eclipse Modeling Project # "description" property - description of the feature -description = ATL Runtime. +description = ATL Runtime and Development Tools. # "updateSiteName" property - label for the update site ModelingUpdateSiteName=Eclipse Modeling @@ -48,9 +48,9 @@ ModelingUpdateSiteName=Eclipse Modeling copyrightURL = copyright.txt copyright = Copyright (c) 2004, 2009 INRIA. \n\ All rights reserved. This program and the accompanying materials \n\ -are made available under the terms of the Eclipse Public License v1.0 \n\ +are made available under the terms of the Eclipse Public License v2.0 \n\ which accompanies this distribution, and is available at \n\ -http://www.eclipse.org/legal/epl-v10.html \n\ +https://www.eclipse.org/legal/epl-2.0/ \n\ \n\ # "licenseURL" property - URL of the "Feature License" @@ -61,125 +61,143 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 9, 2014\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## diff --git a/plugins/org.eclipse.m2m.atl-feature/feature.xml b/plugins/org.eclipse.m2m.atl-feature/feature.xml index 06a6474b..0a90bac8 100644 --- a/plugins/org.eclipse.m2m.atl-feature/feature.xml +++ b/plugins/org.eclipse.m2m.atl-feature/feature.xml @@ -2,12 +2,12 @@ <feature id="org.eclipse.m2m.atl" label="%featureName" - version="4.1.0.qualifier" + version="4.10.0.qualifier" provider-name="%providerName" plugin="org.eclipse.m2m.atl"> <description> - ATL Runtime + %description </description> <copyright url="%copyrightURL"> @@ -23,169 +23,20 @@ <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> </url> - <requires> - <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.debug.ui" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.jface.text" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui.editors"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.ui.workbench.texteditor"/> - <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.compare"/> - <import plugin="org.eclipse.emf.edit"/> - <import plugin="org.eclipse.emf.common.ui"/> - <import plugin="org.eclipse.core.resources" version="3.5.2" match="greaterOrEqual"/> - <import plugin="org.antlr.runtime" version="3.0.0" match="equivalent"/> - <import plugin="org.eclipse.emf.common"/> - <import plugin="org.eclipse.emf.ecore"/> - <import plugin="org.eclipse.debug.core" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.emf.codegen"/> - <import plugin="org.eclipse.ui.console" version="3.4.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.emf.ecore.editor"/> - <import plugin="org.apache.ant" version="1.7.1" match="greaterOrEqual"/> - <import plugin="org.eclipse.m2m.atl.emftvm"/> - </requires> - - <plugin - id="org.eclipse.m2m.atl.engine.emfvm" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.adt.debug" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.adt.editor" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.drivers.emf4atl" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.drivers.uml24atl" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin + <includes id="org.eclipse.m2m.atl.engine" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.engine.vm" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.antlr.runtime" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> - <plugin - id="org.eclipse.m2m.atl.dsls" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin + <includes id="org.eclipse.m2m.atl.adt" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.adt.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.core.emf" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.core.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.core.ui.vm" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.common" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.core.ant" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> - <plugin - id="org.eclipse.m2m.atl.engine.emfvm.launch" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + <includes + id="org.eclipse.m2m.atl.emftvm.engine" + version="0.0.0"/> - <plugin - id="org.eclipse.m2m.atl.debug.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + <includes + id="org.eclipse.m2m.atl.emftvm.ui" + version="0.0.0"/> </feature> diff --git a/plugins/org.eclipse.m2m.atl-feature/license.html b/plugins/org.eclipse.m2m.atl-feature/license.html index cecf137d..afb2f35c 100644 --- a/plugins/org.eclipse.m2m.atl-feature/license.html +++ b/plugins/org.eclipse.m2m.atl-feature/license.html @@ -1,106 +1,190 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<?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> -<style type="text/css"></style></head> +</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>
\ No newline at end of file + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/plugins/org.eclipse.m2m.atl-feature/pom.xml b/plugins/org.eclipse.m2m.atl-feature/pom.xml index e61b0569..b47ab6a4 100644 --- a/plugins/org.eclipse.m2m.atl-feature/pom.xml +++ b/plugins/org.eclipse.m2m.atl-feature/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl.features</groupId> <artifactId>org.eclipse.m2m.atl</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/TODO_REMOVE b/plugins/org.eclipse.m2m.atl.adt-feature/TODO_REMOVE deleted file mode 100644 index e69de29b..00000000 --- a/plugins/org.eclipse.m2m.atl.adt-feature/TODO_REMOVE +++ /dev/null diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/about.html b/plugins/org.eclipse.m2m.atl.adt-feature/about.html index 2b9bcfbe..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.adt-feature/about.html +++ b/plugins/org.eclipse.m2m.atl.adt-feature/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>May 30, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/build.properties b/plugins/org.eclipse.m2m.atl.adt-feature/build.properties index 87baa49e..ee0cefd9 100644 --- a/plugins/org.eclipse.m2m.atl.adt-feature/build.properties +++ b/plugins/org.eclipse.m2m.atl.adt-feature/build.properties @@ -1,14 +1,10 @@ bin.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ - license.html,\ - license.txt + license.html src.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ license.html -root=rootfiles - - diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/epl-v10.html b/plugins/org.eclipse.m2m.atl.adt-feature/epl-v10.html deleted file mode 100644 index cb1073a4..00000000 --- a/plugins/org.eclipse.m2m.atl.adt-feature/epl-v10.html +++ /dev/null @@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<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=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - 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; - } -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; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@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></p> - -</div> - -</body> - -</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.adt-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.adt-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/feature.properties b/plugins/org.eclipse.m2m.atl.adt-feature/feature.properties index 7b549135..881d1c6e 100644 --- a/plugins/org.eclipse.m2m.atl.adt-feature/feature.properties +++ b/plugins/org.eclipse.m2m.atl.adt-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002-2005 ATLAS Group (INRIA & LINA). # * All rights reserved. This program and the accompanying materials -# * are made available under the terms of the Eclipse Public License v1.0 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * ATLAS Group (INRIA & LINA) @@ -29,7 +29,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=ATL_ADT Feature +featureName=ATL Development Toolkit # "providerName" property - name of the company that provides the feature providerName=Eclipse.org @@ -37,143 +37,167 @@ providerName=Eclipse.org # "description" property - description of the feature description=ATL Development Toolkit -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html +# "updateSiteName" property - label for the update site +ModelingUpdateSiteName=Eclipse Modeling # ============================================================================== # %%% END OF TRANSLATED PROPERTIES %%% # The above properties have been shipped for translation. # ============================================================================== +copyrightURL = copyright.txt +copyright = Copyright (c) 2004, 2009 INRIA. \n\ +All rights reserved. This program and the accompanying materials \n\ +are made available under the terms of the Eclipse Public License v2.0 \n\ +which accompanies this distribution, and is available at \n\ +https://www.eclipse.org/legal/epl-2.0/ \n\ + \n\ + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +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\ -February 1, 2011\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - 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\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - 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\ - - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - 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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ - the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ - extending or updating the functionality of an Eclipse-based product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ - Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ - govern the use of the Installable Software ("Installable Software Agreement") and such\n\ - Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ - with the Specification. Such Installable Software Agreement must inform the user of the\n\ - terms and conditions that govern the Installable Software and must solicit acceptance by\n\ - the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation\n\ - of the Installable Software.\n\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## - - -# "updateSiteName" property - label for the update site -ModelingUpdateSiteName=Eclipse Modeling diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/feature.xml b/plugins/org.eclipse.m2m.atl.adt-feature/feature.xml index ebf10f73..96b3b48b 100644 --- a/plugins/org.eclipse.m2m.atl.adt-feature/feature.xml +++ b/plugins/org.eclipse.m2m.atl.adt-feature/feature.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.m2m.atl.adt" - label="ATL Development Tools" - version="2.0.0.qualifier" + label="%featureName" + version="4.10.0.qualifier" provider-name="Eclipse.org"> <description> - ATL Development Toolkit Feature + %description </description> <url> @@ -14,233 +14,20 @@ <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> </url> - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - /* - * Copyright (c) 2004, ATLAS Group (INRIA and LINA). - * 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 - * - */ + <copyright url="%copyrightURL"> + %copyright </copyright> - <license url="http://www.eclipse.org/legal/epl-v10.html"> - Eclipse Public License - v 1.0 -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. -1. DEFINITIONS -"Contribution" means: -a) in the case of the initial Contributor, the initial code and -documentation distributed under this Agreement, and -b) in the case of each subsequent Contributor: -i) changes to the Program, and -ii) additions to the Program; -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. -"Contributor" means any person or entity that distributes the -Program. -"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. -"Program" means the Contributions distributed in accordance with -this Agreement. -"Recipient" means anyone who receives the Program under this -Agreement, including all Contributors. -2. GRANT OF RIGHTS -a) Subject to the terms of this Agreement, each Contributor hereby -grants Recipient a non-exclusive, worldwide, royalty-free copyright -license to 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. -b) Subject to the terms of this Agreement, each Contributor hereby -grants Recipient a non-exclusive, worldwide, 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. -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. -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. -3. REQUIREMENTS -A Contributor may choose to distribute the Program in object -code form under its own license agreement, provided that: -a) it complies with the terms and conditions of this Agreement; -and -b) its license agreement: -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; -ii) effectively excludes on behalf of all Contributors all liability -for damages, including direct, indirect, special, incidental -and consequential damages, such as lost profits; -iii) states that any provisions which differ from this Agreement -are offered by that Contributor alone and not by any other party; -and -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. -When the Program is made available in source code form: -a) it must be made available under this Agreement; and -b) a copy of this Agreement must be included with each copy of -the Program. -Contributors may not remove or alter any copyright notices contained -within the Program. -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. -4. COMMERCIAL DISTRIBUTION -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. -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. -5. NO WARRANTY -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. -6. DISCLAIMER OF LIABILITY -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. -7. GENERAL -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. -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. -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. -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. -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. + <license url="%licenseURL"> + %license </license> - <requires> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.debug.core"/> - <import plugin="org.eclipse.debug.ui"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.jface.text"/> - <import plugin="org.eclipse.ui.editors"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.ui.workbench.texteditor"/> - <import plugin="org.eclipse.emf.ecore"/> - <import plugin="org.eclipse.m2m.atl.engine"/> - <import plugin="org.eclipse.m2m.atl.ocl.core"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.ui.console"/> - <import plugin="org.eclipse.emf.ecore.xmi"/> - </requires> + <plugin + id="org.eclipse.m2m.atl.adt" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="org.eclipse.m2m.atl.adt.debug" @@ -257,21 +44,35 @@ litigation. unpack="false"/> <plugin - id="org.eclipse.m2m.atl.adt.perspective" + id="org.eclipse.m2m.atl.adt.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.core.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.core.ui.vm" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.eclipse.m2m.atl.adt.wizard" + id="org.eclipse.m2m.atl.engine.emfvm.launch" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.eclipse.m2m.atl.adt.builder" + id="org.eclipse.m2m.atl.debug.core" download-size="0" install-size="0" version="0.0.0" diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/license.html b/plugins/org.eclipse.m2m.atl.adt-feature/license.html index f19c483b..c35d8345 100644 --- a/plugins/org.eclipse.m2m.atl.adt-feature/license.html +++ b/plugins/org.eclipse.m2m.atl.adt-feature/license.html @@ -21,8 +21,8 @@ <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>. +<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 2.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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 diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/pom.xml b/plugins/org.eclipse.m2m.atl.adt-feature/pom.xml new file mode 100644 index 00000000..6890f0d4 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.adt-feature/pom.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2012 Obeo. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v2.0 + which accompanies this distribution, and is available at + https://www.eclipse.org/legal/epl-2.0/ + + Contributors: + Obeo - initial creator + --> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>m2m.atl-parent</artifactId> + <groupId>org.eclipse.m2m.atl</groupId> + <version>4.10.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> + </parent> + <groupId>org.eclipse.m2m.atl.features</groupId> + <artifactId>org.eclipse.m2m.atl.adt</artifactId> + <version>4.10.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> + +</project> diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/rootfiles/epl-v10.html b/plugins/org.eclipse.m2m.atl.adt-feature/rootfiles/epl-v10.html deleted file mode 100644 index cb1073a4..00000000 --- a/plugins/org.eclipse.m2m.atl.adt-feature/rootfiles/epl-v10.html +++ /dev/null @@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<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=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - 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; - } -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; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@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></p> - -</div> - -</body> - -</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.adt-feature/rootfiles/notice.html b/plugins/org.eclipse.m2m.atl.adt-feature/rootfiles/notice.html deleted file mode 100644 index 74122b24..00000000 --- a/plugins/org.eclipse.m2m.atl.adt-feature/rootfiles/notice.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</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.org CVS repository ("Repository") in CVS - 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<sup>TM</sup> 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 Eclipse Update Manager, 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>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>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</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>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> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.adt.debug/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.adt.debug/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.adt.debug/META-INF/MANIFEST.MF index 0b133cbf..36105663 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.adt.debug/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.adt.debug;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Activator: org.eclipse.m2m.atl.adt.debug.AtlDebugPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/about.html b/plugins/org.eclipse.m2m.atl.adt.debug/about.html index 9d9e5a6e..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/about.html +++ b/plugins/org.eclipse.m2m.atl.adt.debug/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 5, 2004</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/pom.xml b/plugins/org.eclipse.m2m.atl.adt.debug/pom.xml index 5b8e4814..02af08eb 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/pom.xml +++ b/plugins/org.eclipse.m2m.atl.adt.debug/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.adt.debug</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/AtlDebugPlugin.java b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/AtlDebugPlugin.java index e426def9..d2b83a73 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/AtlDebugPlugin.java +++ b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/AtlDebugPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/Messages.java b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/Messages.java index f01f2ca3..3f9545dd 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/Messages.java +++ b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/messages.properties b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/messages.properties index 341b945e..b205f26b 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/messages.properties +++ b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointAdapter.java b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointAdapter.java index 1e81aba9..c263a973 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointAdapter.java +++ b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointAdapter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointAdapterFactory.java b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointAdapterFactory.java index e1f9a9cd..0f11374b 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointAdapterFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointImageProvider.java b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointImageProvider.java index 588a23d1..ec32a58b 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointImageProvider.java +++ b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlBreakpointImageProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlDebugModelPresentation.java b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlDebugModelPresentation.java index 9c58d229..c057fb2c 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlDebugModelPresentation.java +++ b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/AtlDebugModelPresentation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/DisassemblyDocumentProvider.java b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/DisassemblyDocumentProvider.java index 12c35211..f4a39a69 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/DisassemblyDocumentProvider.java +++ b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/DisassemblyDocumentProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/DisassemblyModeAction.java b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/DisassemblyModeAction.java index d8bf44d0..dfc39467 100644 --- a/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/DisassemblyModeAction.java +++ b/plugins/org.eclipse.m2m.atl.adt.debug/src/org/eclipse/m2m/atl/adt/debug/ui/DisassemblyModeAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.adt.editor/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.adt.editor/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.adt.editor/META-INF/MANIFEST.MF index 82a9777d..5818c848 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.adt.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.adt.editor;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Activator: org.eclipse.m2m.atl.adt.ui.AtlUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/about.html b/plugins/org.eclipse.m2m.atl.adt.editor/about.html index 9d9e5a6e..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/about.html +++ b/plugins/org.eclipse.m2m.atl.adt.editor/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 5, 2004</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/pom.xml b/plugins/org.eclipse.m2m.atl.adt.editor/pom.xml index b290fab1..12c7917e 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/pom.xml +++ b/plugins/org.eclipse.m2m.atl.adt.editor/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.adt.editor</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/AtlPreferenceConstants.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/AtlPreferenceConstants.java index 421fffa8..b6e7cc65 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/AtlPreferenceConstants.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/AtlPreferenceConstants.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java index 207c2de1..b4879d1b 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/IAtlContextMenuConstants.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/IAtlContextMenuConstants.java index ba9b771b..f904afdd 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/IAtlContextMenuConstants.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/IAtlContextMenuConstants.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/IAtlStatusConstants.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/IAtlStatusConstants.java index 2a0196ad..3e7ad680 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/IAtlStatusConstants.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/IAtlStatusConstants.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/FormatCodeAction.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/FormatCodeAction.java index a57aa43a..d4ac7427 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/FormatCodeAction.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/FormatCodeAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/GotoMatchingBracketAction.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/GotoMatchingBracketAction.java index f2fd1181..c17d8ee8 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/GotoMatchingBracketAction.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/GotoMatchingBracketAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/IAtlActionConstants.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/IAtlActionConstants.java index 36769206..66dc477a 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/IAtlActionConstants.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/IAtlActionConstants.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/IndentAction.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/IndentAction.java index 04be977d..7d59377c 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/IndentAction.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/IndentAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/OpenDeclarationAction.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/OpenDeclarationAction.java index 5fcf6a41..b111a85e 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/OpenDeclarationAction.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/OpenDeclarationAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/ToggleCommentAction.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/ToggleCommentAction.java index ded21d6d..4dead521 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/ToggleCommentAction.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/actions/ToggleCommentAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2000, 2005 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/corext/doc/SingleCharReader.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/corext/doc/SingleCharReader.java index b51b891b..236447c1 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/corext/doc/SingleCharReader.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/corext/doc/SingleCharReader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/AtlEditor.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/AtlEditor.java index 78706162..d8566129 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/AtlEditor.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/AtlEditor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/AtlOccurrencesFinder.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/AtlOccurrencesFinder.java index 47d9a915..be6fa0d1 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/AtlOccurrencesFinder.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/AtlOccurrencesFinder.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/IOccurrencesFinder.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/IOccurrencesFinder.java index c5ed5da8..044b6769 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/IOccurrencesFinder.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/IOccurrencesFinder.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2000, 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/Messages.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/Messages.java index 83727a39..05811ad9 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/Messages.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/AtlCodeFormatter.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/AtlCodeFormatter.java index 855204e6..44b36123 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/AtlCodeFormatter.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/AtlCodeFormatter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/AtlCodeFormatterPreferences.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/AtlCodeFormatterPreferences.java index 6a8e1ef3..604ca1e1 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/AtlCodeFormatterPreferences.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/AtlCodeFormatterPreferences.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/InvalidFragmentException.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/InvalidFragmentException.java index 1dd65ce4..2f04fc48 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/InvalidFragmentException.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/InvalidFragmentException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/CodeFragment.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/CodeFragment.java index f0883bc5..f7876b09 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/CodeFragment.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/CodeFragment.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/FormattedObject.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/FormattedObject.java index cea5bcfd..968b96d1 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/FormattedObject.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/FormattedObject.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/SpecialFormatterSpace.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/SpecialFormatterSpace.java index e4435b35..0fae3862 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/SpecialFormatterSpace.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/editor/formatter/objects/SpecialFormatterSpace.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AlphabeticalSorter.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AlphabeticalSorter.java index 4eeb9e06..60fec56b 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AlphabeticalSorter.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AlphabeticalSorter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlAction.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlAction.java index 5b193304..61dbe059 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlAction.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlContentOutlinePage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlContentOutlinePage.java index 844d6289..d091d862 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlContentOutlinePage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlContentOutlinePage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation @@ -26,8 +26,8 @@ import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.m2m.atl.adt.ui.AtlUIPlugin; import org.eclipse.m2m.atl.adt.ui.editor.AtlEditor; import org.eclipse.m2m.atl.common.AtlNbCharFile; @@ -38,6 +38,7 @@ import org.eclipse.ui.IPerspectiveDescriptor; import org.eclipse.ui.IPerspectiveListener; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; @@ -52,9 +53,10 @@ public class AtlContentOutlinePage extends AtlOutlinePage { * @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, * org.eclipse.ui.IPerspectiveDescriptor) */ - public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { - if (page == getSite().getPage()) { - int newDepth = computeDepth(perspective); + public void perspectiveActivated(final IWorkbenchPage page, final IPerspectiveDescriptor perspective) { + final IPageSite site = getSite(); + if (site != null && page == site.getPage()) { + final int newDepth = computeDepth(perspective); if (depth != newDepth) { depth = newDepth; doSetSelection(cursorPosition); @@ -66,8 +68,8 @@ public class AtlContentOutlinePage extends AtlOutlinePage { * @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, * org.eclipse.ui.IPerspectiveDescriptor, java.lang.String) */ - public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, - String changeId) { + public void perspectiveChanged(final IWorkbenchPage page, final IPerspectiveDescriptor perspective, + final String changeId) { // do nothing } @@ -79,11 +81,11 @@ public class AtlContentOutlinePage extends AtlOutlinePage { /** The wake up frequency of the background thread in charge of the refresh of the outline tree viewer */ // private static final int REFRESH_PERIOD = 5000; /* Sorter enabling sorting the content of the tree viewer */ - private ViewerSorter alphabeticalSorter, defaultSorter; + private ViewerComparator alphabeticalSorter, defaultSorter; /** * A description of the current cursor position of the associated editor - * + * * @see org.eclipse.ui.texteditor.AbstractTextEditor#getCursorPosition() */ private String cursorPosition; @@ -102,7 +104,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { * <code>AtlNbCharFile</code> class is useful to get index char start and index char end from the location * string * </p> - * + * * @see AtlNbCharFile */ private static AtlNbCharFile help; @@ -144,15 +146,15 @@ public class AtlContentOutlinePage extends AtlOutlinePage { private EObject selectedEo; /** The ATL editor associated with this outline. */ - private AtlEditor textEditor; + private final AtlEditor textEditor; /** * @param textEditor * @param editorInput * @param documentProvider */ - public AtlContentOutlinePage(ITextEditor textEditor, IEditorInput editorInput, - IDocumentProvider documentProvider) { + public AtlContentOutlinePage(final ITextEditor textEditor, final IEditorInput editorInput, + final IDocumentProvider documentProvider) { super(); this.textEditor = (AtlEditor)textEditor; } @@ -165,22 +167,22 @@ public class AtlContentOutlinePage extends AtlOutlinePage { * This is useful when some parameters need to be adjusted according to the current perspective. In the * present case the <code>depth</code> is different in the debug perspective. * </p> - * + * * @param l * the perspective listener to add */ - private void addPerspectiveListener(IPerspectiveListener l) { + private void addPerspectiveListener(final IPerspectiveListener l) { getSite().getPage().getWorkbenchWindow().addPerspectiveListener(l); } /** * computes the <code>depth</code> for the current perspective. The depth varies according to the * perspective - * + * * @param ipd * the perspective for which to compute the depth */ - private int computeDepth(IPerspectiveDescriptor ipd) { + private int computeDepth(final IPerspectiveDescriptor ipd) { if (IDebugUIConstants.ID_DEBUG_PERSPECTIVE.equals(ipd.getId())) { return -1; } @@ -196,7 +198,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { cutAction = new Action("Cut") { //$NON-NLS-1$ /** * {@inheritDoc} - * + * * @see org.eclipse.jface.action.Action#run() */ @Override @@ -209,7 +211,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { copyAction = new Action("Copy") { //$NON-NLS-1$ /** * {@inheritDoc} - * + * * @see org.eclipse.jface.action.Action#run() */ @Override @@ -222,7 +224,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { pasteAction = new Action("Paste") { //$NON-NLS-1$ /** * {@inheritDoc} - * + * * @see org.eclipse.jface.action.Action#run() */ @Override @@ -235,16 +237,16 @@ public class AtlContentOutlinePage extends AtlOutlinePage { addBreakPointAction = new Action("Toggle breakpoint") { //$NON-NLS-1$ /** * {@inheritDoc} - * + * * @see org.eclipse.jface.action.Action#run() */ @Override public void run() { - IStructuredSelection is = (IStructuredSelection)treeViewer.getSelection(); - EObject element = (EObject)is.getFirstElement(); + final IStructuredSelection is = (IStructuredSelection)treeViewer.getSelection(); + final EObject element = (EObject)is.getFirstElement(); try { textEditor.toggleLineBreakpoints(element); - } catch (CoreException e) { + } catch (final CoreException e) { e.printStackTrace(); } } @@ -268,7 +270,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { filterHelperAction = new Action("Hide Helpers", Action.AS_CHECK_BOX) { //$NON-NLS-1$ /** * {@inheritDoc} - * + * * @see org.eclipse.jface.action.Action#run() */ @Override @@ -282,7 +284,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { filterRuleAction = new Action("Hide rules", Action.AS_CHECK_BOX) { //$NON-NLS-1$ /** * {@inheritDoc} - * + * * @see org.eclipse.jface.action.Action#run() */ @Override @@ -296,7 +298,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { sorterAction = new Action("Alphabetical sort", Action.AS_CHECK_BOX) { //$NON-NLS-1$ /** * {@inheritDoc} - * + * * @see org.eclipse.jface.action.Action#run() */ @Override @@ -313,15 +315,15 @@ public class AtlContentOutlinePage extends AtlOutlinePage { */ private void createContextMenu() { // Create menu manager. - MenuManager menuMgr = new MenuManager(); + final MenuManager menuMgr = new MenuManager(); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager mgr) { + public void menuAboutToShow(final IMenuManager mgr) { fillContextMenu(mgr); } }); // Create menu. - Menu menu = menuMgr.createContextMenu(treeViewer.getControl()); + final Menu menu = menuMgr.createContextMenu(treeViewer.getControl()); treeViewer.getControl().setMenu(menu); // Register menu for extension. getSite().registerContextMenu(ATL_OUTLINE_VIEW_CONTEXT_MENU_ID, menuMgr, this); @@ -329,15 +331,15 @@ public class AtlContentOutlinePage extends AtlOutlinePage { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.adt.ui.outline.AtlOutlinePage#createControl(org.eclipse.swt.widgets.Composite) */ @Override - public void createControl(Composite arg0) { + public void createControl(final Composite arg0) { super.createControl(arg0); root = new Root(); // Add all listeners that were added when the tree viewer was null - Object[] listeners = selectionChangedListeners.getListeners(); + final Object[] listeners = selectionChangedListeners.getListeners(); for (int i = 0; i < listeners.length; i++) { selectionChangedListeners.remove(listeners[i]); treeViewer.addPostSelectionChangedListener((ISelectionChangedListener)listeners[i]); @@ -351,7 +353,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { createFiltersAndSorters(); setUnit(); treeViewer.addFilter(defaultFilter); - treeViewer.setSorter(defaultSorter); + treeViewer.setComparator(defaultSorter); // Necessary so that the PropertySheetView hears about selections in the treeViewer getSite().setSelectionProvider(treeViewer); this.perspectiveListener = new PerspectiveListener(); @@ -374,7 +376,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { * Creates a menu (for the view) with the same actions than the toolbar. */ private void createMenu() { - IMenuManager mgr = getSite().getActionBars().getMenuManager(); + final IMenuManager mgr = getSite().getActionBars().getMenuManager(); // mgr.add(refreshItemAction); mgr.add(filterHelperAction); mgr.add(filterRuleAction); @@ -386,39 +388,45 @@ public class AtlContentOutlinePage extends AtlOutlinePage { * the tree viewer. */ private void createToolbar() { - IToolBarManager mgr = getSite().getActionBars().getToolBarManager(); + final IToolBarManager mgr = getSite().getActionBars().getToolBarManager(); // mgr.add(refreshItemAction); mgr.add(filterHelperAction); mgr.add(filterRuleAction); mgr.add(sorterAction); } - private void doSetSelection(String currentCursorPosition) { + private void doSetSelection(final String currentCursorPosition) { if (!(currentCursorPosition == null || treeViewer.getTree().isDisposed())) { this.cursorPosition = currentCursorPosition; - Root input = (Root)treeViewer.getInput(); + final Root input = (Root)treeViewer.getInput(); if (input != null) { - EObject unit = input.getUnit(); - int cursorIndexChar = help.getIndex(currentCursorPosition); - if (cursorIndexChar == -1) { - return; + final EObject unit = input.getUnit(); + try { + final int cursorIndexChar = help.getIndex(currentCursorPosition); + if (cursorIndexChar == -1) { + return; + } + this.selectedEo = unit; + setSelection(unit, cursorIndexChar, 0); + treeViewer.collapseAll(); + treeViewer.expandToLevel(2); + showItem(selectedEo); + } catch (final NumberFormatException nfe) { + // do nothing + } catch (final IndexOutOfBoundsException ioobe) { + // do nothing } - this.selectedEo = unit; - setSelection(unit, cursorIndexChar, 0); - treeViewer.collapseAll(); - treeViewer.expandToLevel(2); - showItem(selectedEo); } } } /** * Fills the context menu with actions that were previously created. - * + * * @param mgr * the menu manager */ - private void fillContextMenu(IMenuManager mgr) { + private void fillContextMenu(final IMenuManager mgr) { mgr.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS)); mgr.add(cutAction); mgr.add(copyAction); @@ -433,7 +441,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { /** * Returns the perspective descriptor of the current perspective. - * + * * @return the perspective descriptor of the current perspective */ private IPerspectiveDescriptor getCurrentPerspective() { @@ -442,18 +450,18 @@ public class AtlContentOutlinePage extends AtlOutlinePage { /** * Return an array with two value. first value : index of start char second value : index of end char. - * + * * @param eo * The EObject for which to compute index of end/start char * @return return an array with two value. first value : index of start char second value : index of end * char */ - private static int[] getPos(EObject eo) { - String location = (String)eo.eGet(AtlEMFConstants.sfLocation); + private static int[] getPos(final EObject eo) { + final String location = (String)eo.eGet(AtlEMFConstants.sfLocation); if (location == null) { return null; } - int[] pos = help.getIndexChar(location); + final int[] pos = help.getIndexChar(location); return pos; } @@ -461,7 +469,7 @@ public class AtlContentOutlinePage extends AtlOutlinePage { * Initializes the <code>AtlNbCharFile</code> object used to convert the location string and passes it to * the <code>DefaultSorter</code> object. */ - private void initAtlNbCharFile(String content) { + private void initAtlNbCharFile(final String content) { help = new AtlNbCharFile(toInputStream(content)); ((DefaultSorter)defaultSorter).setHelp(help); textEditor.setHelp(help); @@ -471,8 +479,8 @@ public class AtlContentOutlinePage extends AtlOutlinePage { * Sets the Unit of the input of the tree Viewer. */ public void setUnit() { - EObject eo = textEditor.getSourceManager().getModel(); - String newContent = textEditor.getDocumentProviderContent(); + final EObject eo = textEditor.getSourceManager().getModel(); + final String newContent = textEditor.getDocumentProviderContent(); if (eo != null) { root.setUnit(eo); if (!inputSet) { @@ -488,21 +496,21 @@ public class AtlContentOutlinePage extends AtlOutlinePage { /** * Updates the tree viewer selection according to the editor cursor position. */ - private void setSelection(EObject input, int cursorIndexChar, int currentLevel) { + private void setSelection(final EObject input, final int cursorIndexChar, final int currentLevel) { if (input == null || input.eContents() == null || input.eContents().isEmpty()) { return; } - Object[] contents = input.eContents().toArray(); + final Object[] contents = input.eContents().toArray(); for (int i = 0; i < contents.length; i++) { - EObject eo = (EObject)contents[i]; - int[] pos = getPos(eo); + final EObject eo = (EObject)contents[i]; + final int[] pos = getPos(eo); if (pos == null) { // some EObject define no location continue; } - int eoStartChar = pos[0]; - int eoEndChar = pos[1]; + final int eoStartChar = pos[0]; + final int eoEndChar = pos[1]; if (eoStartChar <= cursorIndexChar && eoEndChar >= cursorIndexChar) { this.selectedEo = eo; if ((currentLevel + 1 < depth) || (depth == -1)) { @@ -516,23 +524,23 @@ public class AtlContentOutlinePage extends AtlOutlinePage { /** * Sets the selection to the given cursorPosition. - * + * * @param currentCursorPosition * the cursor position */ - public void setSelection(String currentCursorPosition) { + public void setSelection(final String currentCursorPosition) { doSetSelection(currentCursorPosition); } /** * Highlights the given item in the tree viewer and makes it visible to the user, scrolling the tree * viewer if necessary. And adjusts the highlighted range in the associated editor. - * + * * @param element * the element to show in the tree viewer */ - private void showItem(EObject element) { - int[] pos = getPos(element); + private void showItem(final EObject element) { + final int[] pos = getPos(element); if (pos != null) { if (pos[1] - pos[0] > 0) { textEditor.setHighlightRange(pos[0], pos[1] - pos[0], false); @@ -543,22 +551,22 @@ public class AtlContentOutlinePage extends AtlOutlinePage { /** * Converts from <code>String</code> to <code>InputStream</code>. - * + * * @param contents * the <code>String</code> to convert * @return the created InputStream */ - private InputStream toInputStream(String contents) { + private InputStream toInputStream(final String contents) { return new ByteArrayInputStream(contents.getBytes()); } /** * Updates the filters of the tree viewer Multiple filters can be enabled at a time. - * + * * @param actionParam * the action */ - protected void updateFilters(Action actionParam) { + protected void updateFilters(final Action actionParam) { if (actionParam == filterHelperAction) { if (actionParam.isChecked()) { treeViewer.addFilter(helperFilter); @@ -576,16 +584,16 @@ public class AtlContentOutlinePage extends AtlOutlinePage { /** * Updates the sorter of the tree viewer One sorter can be enabled at a time. - * + * * @param actionParam * the action */ - protected void updateSorter(Action actionParam) { + protected void updateSorter(final Action actionParam) { if (actionParam == sorterAction) { if (actionParam.isChecked()) { - treeViewer.setSorter(alphabeticalSorter); + treeViewer.setComparator(alphabeticalSorter); } else { - treeViewer.setSorter(defaultSorter); + treeViewer.setComparator(defaultSorter); } } } diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlContentProvider.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlContentProvider.java index 7c4a2cfd..3dd06fc3 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlContentProvider.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlContentProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlEMFConstants.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlEMFConstants.java index e35f909a..42127306 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlEMFConstants.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlEMFConstants.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlLabelProvider.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlLabelProvider.java index cc2fc69c..ec46b03a 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlLabelProvider.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlLabelProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlOutlinePage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlOutlinePage.java index f39c50f0..b08a10ff 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlOutlinePage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/AtlOutlinePage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/DefaultFilter.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/DefaultFilter.java index 4a8fed0d..f55046c0 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/DefaultFilter.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/DefaultFilter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/DefaultSorter.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/DefaultSorter.java index 8f27c511..7ede3268 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/DefaultSorter.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/DefaultSorter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/Event.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/Event.java index f88ef48a..5b3fcfc2 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/Event.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/Event.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/EventListener.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/EventListener.java index 355efddd..4bf88306 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/EventListener.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/EventListener.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/HideHelperFilter.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/HideHelperFilter.java index adc8f5d3..02a9c977 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/HideHelperFilter.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/HideHelperFilter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/HideRuleFilter.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/HideRuleFilter.java index d20e2f29..69d97397 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/HideRuleFilter.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/HideRuleFilter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/NullEventListener.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/NullEventListener.java index 20254997..6650b180 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/NullEventListener.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/NullEventListener.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/RenameAction.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/RenameAction.java index 682a863c..9369ce19 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/RenameAction.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/RenameAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/RenameFrame.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/RenameFrame.java index 0b2c6599..75d146f5 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/RenameFrame.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/RenameFrame.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/Root.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/Root.java index c50615e5..9ff7a042 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/Root.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/outline/Root.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AbstractPropertyAndPreferencePage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AbstractPropertyAndPreferencePage.java index 45a1a26a..9b3f9836 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AbstractPropertyAndPreferencePage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AbstractPropertyAndPreferencePage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AlreadyExistsDialog.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AlreadyExistsDialog.java index b8308144..2feb64be 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AlreadyExistsDialog.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AlreadyExistsDialog.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2000, 2010 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeAssistPreferencePage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeAssistPreferencePage.java index f1656b34..29915b59 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeAssistPreferencePage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeAssistPreferencePage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterProfileManager.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterProfileManager.java index ad6dac99..064e39f6 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterProfileManager.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterProfileManager.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterProfilesTabPage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterProfilesTabPage.java index 4e9d03db..c9a22525 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterProfilesTabPage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterProfilesTabPage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterPropertiesTabPage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterPropertiesTabPage.java index 95d25353..5726bf69 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterPropertiesTabPage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterPropertiesTabPage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterPropertyPage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterPropertyPage.java index f7de1a83..b3317aa9 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterPropertyPage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlCodeFormatterPropertyPage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlEditorPreferencePage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlEditorPreferencePage.java index 70ad79d4..7b05ed03 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlEditorPreferencePage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlEditorPreferencePage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlEditorPropertyPage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlEditorPropertyPage.java index 5031bbcc..9b439132 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlEditorPropertyPage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlEditorPropertyPage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlMainPreferencePage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlMainPreferencePage.java index 9653efb4..39d1d407 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlMainPreferencePage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlMainPreferencePage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlMainPropertyPage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlMainPropertyPage.java index c99f2e48..365aa2a4 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlMainPropertyPage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlMainPropertyPage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreferenceStore.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreferenceStore.java index 7540432c..6759074e 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreferenceStore.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreferenceStore.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreferencesMessages.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreferencesMessages.java index 1a6da448..1cf34763 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreferencesMessages.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreferencesMessages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreview.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreview.java index cce9c710..bbde0006 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreview.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlPreview.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlSyntaxPreferencePage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlSyntaxPreferencePage.java index 0e228204..011c4135 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlSyntaxPreferencePage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlSyntaxPreferencePage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlTypingPreferencePage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlTypingPreferencePage.java index 23333a84..6682d8eb 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlTypingPreferencePage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/AtlTypingPreferencePage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/CreateProfileDialog.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/CreateProfileDialog.java index 99a45251..93d3fd80 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/CreateProfileDialog.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/CreateProfileDialog.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2000, 2010 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/IModifyDialogTabPage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/IModifyDialogTabPage.java index ff3af890..38c895fc 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/IModifyDialogTabPage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/IModifyDialogTabPage.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ModifyDialogTabPage.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ModifyDialogTabPage.java index 1e00ed16..4f14a7db 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ModifyDialogTabPage.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ModifyDialogTabPage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2000, 2010 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/PreferencesAccess.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/PreferencesAccess.java index f278ad5a..7716d9ea 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/PreferencesAccess.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/PreferencesAccess.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2000, 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ProfileManager.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ProfileManager.java index 1f287682..8e9cff83 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ProfileManager.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ProfileManager.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2000, 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ProfileStore.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ProfileStore.java index 6ae8af9a..d7b38635 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ProfileStore.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/ProfileStore.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2000, 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/RenameProfileDialog.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/RenameProfileDialog.java index 74e3c578..a1b8866d 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/RenameProfileDialog.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/preferences/RenameProfileDialog.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2000, 2010 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/properties/AtlElementProperties.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/properties/AtlElementProperties.java index 5b31f848..352acbed 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/properties/AtlElementProperties.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/properties/AtlElementProperties.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/properties/AtlPropertySourceProvider.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/properties/AtlPropertySourceProvider.java index 47f0a0a3..ac2d07be 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/properties/AtlPropertySourceProvider.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/properties/AtlPropertySourceProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AbstractScanner.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AbstractScanner.java index 4cb050e4..aae05981 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AbstractScanner.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AbstractScanner.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlAnnotationHover.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlAnnotationHover.java index 954ead1d..8261ca9c 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlAnnotationHover.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlAnnotationHover.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlCodeReader.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlCodeReader.java index 81096fa5..124dff05 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlCodeReader.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlCodeReader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlColorManager.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlColorManager.java index cbd1fa43..f3b1c42f 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlColorManager.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlColorManager.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlContentAssistPreference.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlContentAssistPreference.java index ccf16d03..67c9e634 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlContentAssistPreference.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlContentAssistPreference.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlElementHyperlinkDetector.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlElementHyperlinkDetector.java index d0718e2e..9fadfcc3 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlElementHyperlinkDetector.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlElementHyperlinkDetector.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlHeuristicScanner.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlHeuristicScanner.java index 1af2d8cc..6ef5a2d5 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlHeuristicScanner.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlHeuristicScanner.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlIndenter.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlIndenter.java index ae8b584b..d3642376 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlIndenter.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlIndenter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlPairMatcher.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlPairMatcher.java index 90f74937..9c7454db 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlPairMatcher.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlPairMatcher.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlReconcilingStrategy.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlReconcilingStrategy.java index 4dd221a8..c3d71168 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlReconcilingStrategy.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlReconcilingStrategy.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlSourceViewerConfiguration.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlSourceViewerConfiguration.java index d9a17d46..b90bfbb3 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlSourceViewerConfiguration.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlSourceViewerConfiguration.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlTextDoubleClickStrategy.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlTextDoubleClickStrategy.java index bf9ab06f..9f908347 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlTextDoubleClickStrategy.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlTextDoubleClickStrategy.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlTextTools.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlTextTools.java index a341ccff..8ec9fad0 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlTextTools.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlTextTools.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlWordDetector.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlWordDetector.java index 4cd1709a..cbfdc38c 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlWordDetector.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/AtlWordDetector.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/IAtlDefaultValues.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/IAtlDefaultValues.java index 4b5d5a10..f3d039c8 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/IAtlDefaultValues.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/IAtlDefaultValues.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/IAtlPartitions.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/IAtlPartitions.java index dc585dc2..68519e32 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/IAtlPartitions.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/IAtlPartitions.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/Symbols.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/Symbols.java index dcd65324..8ddb9a06 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/Symbols.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/Symbols.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlAutoIndentStrategy.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlAutoIndentStrategy.java index 10a4ddbf..e7462a64 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlAutoIndentStrategy.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlAutoIndentStrategy.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCodeScanner.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCodeScanner.java index 14441177..ee5dab7e 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCodeScanner.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCodeScanner.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionDataSource.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionDataSource.java index 29e92046..c5afa904 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionDataSource.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionDataSource.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionHelper.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionHelper.java index 030be64d..17656fcb 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionHelper.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionHelper.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProcessor.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProcessor.java index 27e2f6d5..2a3766b4 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProcessor.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProcessor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProposal.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProposal.java index 5630117f..f9151624 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProposal.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProposal.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProposalComparator.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProposalComparator.java index 48f2c2dd..0152e19d 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProposalComparator.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlCompletionProposalComparator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlContextType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlContextType.java index fd27a6a5..5f8bf1cd 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlContextType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlContextType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlEditorUI.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlEditorUI.java index 19af40d9..e6198dad 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlEditorUI.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlEditorUI.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlInstalledTemplateProposal.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlInstalledTemplateProposal.java index f3090460..0aaf8a22 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlInstalledTemplateProposal.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlInstalledTemplateProposal.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlModelAnalyser.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlModelAnalyser.java index fc0ed886..4aff4979 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlModelAnalyser.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlModelAnalyser.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlParameterListValidator.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlParameterListValidator.java index c8a32f2d..19b1b170 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlParameterListValidator.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlParameterListValidator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlStringAutoIndentStrategy.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlStringAutoIndentStrategy.java index a5d92ff9..3a541983 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlStringAutoIndentStrategy.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlStringAutoIndentStrategy.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlTemplateProposal.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlTemplateProposal.java index df0de6f3..c583b232 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlTemplateProposal.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/AtlTemplateProposal.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/LastSaveComparator.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/LastSaveComparator.java index 5349a953..07752092 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/LastSaveComparator.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/LastSaveComparator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/OpenDeclarationUtils.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/OpenDeclarationUtils.java index bb7e4297..3c5beb06 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/OpenDeclarationUtils.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/OpenDeclarationUtils.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/AtlTypesProcessor.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/AtlTypesProcessor.java index 6a39f316..c8ae2950 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/AtlTypesProcessor.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/AtlTypesProcessor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/BagType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/BagType.java index ab9a833a..6bec8d95 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/BagType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/BagType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/BooleanType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/BooleanType.java index 4cf6530b..a02196d1 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/BooleanType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/BooleanType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/CollectionType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/CollectionType.java index 68c53b61..cb2437dd 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/CollectionType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/CollectionType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/Feature.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/Feature.java index 45a3aed3..6ccd698c 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/Feature.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/Feature.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/IntegerType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/IntegerType.java index 884f3fd4..15f13dc1 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/IntegerType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/IntegerType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/LibraryType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/LibraryType.java index 8aaede2b..a0ba0c31 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/LibraryType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/LibraryType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/MapType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/MapType.java index 7fae4561..9b46ff7f 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/MapType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/MapType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/ModelElementType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/ModelElementType.java index 3891b387..97b9cbfd 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/ModelElementType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/ModelElementType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/ModuleType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/ModuleType.java index 4f7599ce..b24965e2 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/ModuleType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/ModuleType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OclAnyType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OclAnyType.java index d6ce788e..880979cd 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OclAnyType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OclAnyType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OclType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OclType.java index c3a8a542..1f895950 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OclType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OclType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/Operation.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/Operation.java index 3f960c9f..b80c465d 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/Operation.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/Operation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OrderedSetType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OrderedSetType.java index d858376d..de031c46 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OrderedSetType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/OrderedSetType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/QueryType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/QueryType.java index 32ca5bc6..808fed49 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/QueryType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/QueryType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/RealType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/RealType.java index 95f32daa..43c2af74 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/RealType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/RealType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/SequenceType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/SequenceType.java index 1c8d7455..970c71f0 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/SequenceType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/SequenceType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/SetType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/SetType.java index d941b7ae..31cb0ac6 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/SetType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/SetType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/StringType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/StringType.java index 6da711c6..7bc68545 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/StringType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/StringType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/TupleType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/TupleType.java index e31d5e5d..352dde36 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/TupleType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/TupleType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/UnitType.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/UnitType.java index 33e177c0..173d4f84 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/UnitType.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/atl/types/UnitType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - completion system diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/hover/AtlTextHover.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/hover/AtlTextHover.java index 1af1478f..a7a121f1 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/hover/AtlTextHover.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/text/hover/AtlTextHover.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/AtlEditorTickErrorUpdater.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/AtlEditorTickErrorUpdater.java index 7c60b7d8..d0ee7bd8 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/AtlEditorTickErrorUpdater.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/AtlEditorTickErrorUpdater.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/IProblemChangedListener.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/IProblemChangedListener.java index 40b2ad6b..c070bb61 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/IProblemChangedListener.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/IProblemChangedListener.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/ProblemMarkerManager.java b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/ProblemMarkerManager.java index 889a4a67..0f6ea509 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/ProblemMarkerManager.java +++ b/plugins/org.eclipse.m2m.atl.adt.editor/src/org/eclipse/m2m/atl/adt/ui/viewsupport/ProblemMarkerManager.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/templates/iterators.properties b/plugins/org.eclipse.m2m.atl.adt.editor/templates/iterators.properties index 21ba03d7..bb8eb676 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/templates/iterators.properties +++ b/plugins/org.eclipse.m2m.atl.adt.editor/templates/iterators.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2009, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL templates descriptions diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/templates/patterns.properties b/plugins/org.eclipse.m2m.atl.adt.editor/templates/patterns.properties index 3a99f56f..c3ff1894 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/templates/patterns.properties +++ b/plugins/org.eclipse.m2m.atl.adt.editor/templates/patterns.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2009, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL templates descriptions diff --git a/plugins/org.eclipse.m2m.atl.adt.editor/templates/structure.properties b/plugins/org.eclipse.m2m.atl.adt.editor/templates/structure.properties index 07fc19b3..8269fac1 100644 --- a/plugins/org.eclipse.m2m.atl.adt.editor/templates/structure.properties +++ b/plugins/org.eclipse.m2m.atl.adt.editor/templates/structure.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2009, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL templates descriptions diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.adt.ui/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.adt.ui/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.adt.ui/META-INF/MANIFEST.MF index 303c75ae..e8456d88 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.adt.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.adt.ui;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.m2m.atl.adt.ui, diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/about.html b/plugins/org.eclipse.m2m.atl.adt.ui/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/about.html +++ b/plugins/org.eclipse.m2m.atl.adt.ui/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/pom.xml b/plugins/org.eclipse.m2m.atl.adt.ui/pom.xml index be71479d..b73e80b6 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/pom.xml +++ b/plugins/org.eclipse.m2m.atl.adt.ui/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.adt.ui</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java index dc77682e..1835b274 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/Messages.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/Messages.java index b81e8c22..5580649c 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/Messages.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AbstractAtlSelection.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AbstractAtlSelection.java index 2d27c6a5..be066ffb 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AbstractAtlSelection.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AbstractAtlSelection.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlLibrarySelection.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlLibrarySelection.java index ec0c9dfd..79266d5b 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlLibrarySelection.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlLibrarySelection.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlModelSelection.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlModelSelection.java index a77a0407..6ad50bf2 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlModelSelection.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlModelSelection.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlResourceSelectionBox.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlResourceSelectionBox.java index e5cd1fcc..7d584b6b 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlResourceSelectionBox.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/AtlResourceSelectionBox.java @@ -3,9 +3,9 @@ * * Copyright (c) 2002-2007 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 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/RegisteredPackageDialog.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/RegisteredPackageDialog.java index 4ae6db85..c8afbf12 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/RegisteredPackageDialog.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/RegisteredPackageDialog.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/WorkspaceFileDialog.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/WorkspaceFileDialog.java index 16518a08..7e75ffe3 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/WorkspaceFileDialog.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/common/WorkspaceFileDialog.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/handlers/RegisterMetamodel.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/handlers/RegisterMetamodel.java index 57a037f4..754f17de 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/handlers/RegisterMetamodel.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/handlers/RegisterMetamodel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/handlers/ToggleATLNature.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/handlers/ToggleATLNature.java index e9ffd4b8..4985f1bf 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/handlers/ToggleATLNature.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/handlers/ToggleATLNature.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/messages.properties b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/messages.properties index 767f87c3..60f1b6b8 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/messages.properties +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/perspective/AtlPerspective.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/perspective/AtlPerspective.java index 6c6e44a5..e201e72f 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/perspective/AtlPerspective.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/perspective/AtlPerspective.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/ResourceChangeListener.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/ResourceChangeListener.java index d628af4a..65437461 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/ResourceChangeListener.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/ResourceChangeListener.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/ResourceDeltaVisitor.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/ResourceDeltaVisitor.java index 40662dc6..a04493e9 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/ResourceDeltaVisitor.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/ResourceDeltaVisitor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/Startup.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/Startup.java index abca1b0b..df4fb353 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/Startup.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/startup/Startup.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlfile/AtlFileScreen.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlfile/AtlFileScreen.java index cdf823f2..d4be9fb4 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlfile/AtlFileScreen.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlfile/AtlFileScreen.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlfile/AtlFileWizard.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlfile/AtlFileWizard.java index dddca179..181c1421 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlfile/AtlFileWizard.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlfile/AtlFileWizard.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlplugin/AtlPluginCreator.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlplugin/AtlPluginCreator.java index 184e027a..5467f655 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlplugin/AtlPluginCreator.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlplugin/AtlPluginCreator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlplugin/AtlPluginScreen.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlplugin/AtlPluginScreen.java index 0e18759e..a193d5c4 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlplugin/AtlPluginScreen.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlplugin/AtlPluginScreen.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlproject/AtlProjectCreator.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlproject/AtlProjectCreator.java index 6da7239b..7ecc45e3 100644 --- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlproject/AtlProjectCreator.java +++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/wizard/atlproject/AtlProjectCreator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.adt/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.adt/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.adt/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.adt/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.adt/META-INF/MANIFEST.MF index 205dc1bd..2f00e6f2 100644 --- a/plugins/org.eclipse.m2m.atl.adt/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.adt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.adt;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.m2m.atl.adt, diff --git a/plugins/org.eclipse.m2m.atl.adt/about.html b/plugins/org.eclipse.m2m.atl.adt/about.html index 9d9e5a6e..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.adt/about.html +++ b/plugins/org.eclipse.m2m.atl.adt/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 5, 2004</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.adt/pom.xml b/plugins/org.eclipse.m2m.atl.adt/pom.xml index 38e3a045..a2505d3b 100644 --- a/plugins/org.eclipse.m2m.atl.adt/pom.xml +++ b/plugins/org.eclipse.m2m.atl.adt/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.adt</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateModuleActivatorWriter.java b/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateModuleActivatorWriter.java index c98cd7e4..1e01aa8f 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateModuleActivatorWriter.java +++ b/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateModuleActivatorWriter.java @@ -12,7 +12,7 @@ public class CreateModuleActivatorWriter } public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; - protected final String TEXT_1 = "/*******************************************************************************" + NL + " * Copyright (c) 2010, 2012 Obeo." + NL + " * All rights reserved. This program and the accompanying materials" + NL + " * are made available under the terms of the Eclipse Public License v1.0" + NL + " * which accompanies this distribution, and is available at" + NL + " * http://www.eclipse.org/legal/epl-v10.html" + NL + " * " + NL + " * Contributors:" + NL + " * Obeo - initial API and implementation" + NL + " *******************************************************************************/" + NL + "package "; + protected final String TEXT_1 = "/*******************************************************************************" + NL + " * Copyright (c) 2010, 2012 Obeo." + NL + " * All rights reserved. This program and the accompanying materials" + NL + " * are made available under the terms of the Eclipse Public License v2.0" + NL + " * which accompanies this distribution, and is available at" + NL + " * https://www.eclipse.org/legal/epl-2.0/" + NL + " * " + NL + " * Contributors:" + NL + " * Obeo - initial API and implementation" + NL + " *******************************************************************************/" + NL + "package "; protected final String TEXT_2 = ";" + NL + "" + NL + "import org.eclipse.core.runtime.Plugin;" + NL + "import org.osgi.framework.BundleContext;" + NL + "" + NL + "/**" + NL + " * The activator class controls the plug-in life cycle." + NL + " */" + NL + "public class Activator extends Plugin {" + NL + "" + NL + "\t/**" + NL + "\t * The plug-in ID." + NL + "\t */" + NL + "\tpublic static final String PLUGIN_ID = \""; protected final String TEXT_3 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * The shared instance." + NL + "\t */" + NL + "\tprivate static Activator plugin;" + NL + "\t" + NL + "\t/**" + NL + "\t * The constructor." + NL + "\t */" + NL + "\tpublic Activator() {" + NL + "\t}" + NL + "" + NL + "\t/**{@inheritDoc}" + NL + "\t *" + NL + "\t * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)" + NL + "\t */" + NL + "\tpublic void start(BundleContext context) throws Exception {" + NL + "\t\tsuper.start(context);" + NL + "\t\tplugin = this;" + NL + "\t}" + NL + "" + NL + "\t/**{@inheritDoc}" + NL + "\t *" + NL + "\t * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)" + NL + "\t */" + NL + "\tpublic void stop(BundleContext context) throws Exception {" + NL + "\t\tplugin = null;" + NL + "\t\tsuper.stop(context);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Returns the shared instance." + NL + "\t *" + NL + "\t * @return the shared instance" + NL + "\t */" + NL + "\tpublic static Activator getDefault() {" + NL + "\t\treturn plugin;" + NL + "\t}" + NL + "" + NL + "}"; protected final String TEXT_4 = NL; diff --git a/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateModulePropertiesWriter.java b/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateModulePropertiesWriter.java index 0a6feb7b..a5ce5ed3 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateModulePropertiesWriter.java +++ b/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateModulePropertiesWriter.java @@ -21,19 +21,12 @@ public class CreateModulePropertiesWriter protected final String TEXT_4 = ".modules = "; protected final String TEXT_5 = ","; protected final String TEXT_6 = NL + NL + "# Metamodels paths or nsUris"; - protected final String TEXT_7 = NL; - protected final String TEXT_8 = ".metamodels."; - protected final String TEXT_9 = " = "; - protected final String TEXT_10 = NL + NL + "# Libraries paths"; - protected final String TEXT_11 = NL; - protected final String TEXT_12 = ".libraries."; - protected final String TEXT_13 = " = "; - protected final String TEXT_14 = NL + NL + "# ATL Launching options"; - protected final String TEXT_15 = NL; - protected final String TEXT_16 = ".options."; - protected final String TEXT_17 = " = "; - protected final String TEXT_18 = NL; - protected final String TEXT_19 = NL; + protected final String TEXT_7 = ".metamodels."; + protected final String TEXT_8 = " = "; + protected final String TEXT_9 = NL + NL + "# Libraries paths"; + protected final String TEXT_10 = ".libraries."; + protected final String TEXT_11 = NL + NL + "# ATL Launching options"; + protected final String TEXT_12 = ".options."; public String generate(Object argument) { @@ -55,37 +48,37 @@ public class CreateModulePropertiesWriter } stringBuffer.append(TEXT_6); for (String metamodelName : content.getAllMetamodelsNames()) { String location = content.getMetamodelLocations().get(metamodelName); - stringBuffer.append(TEXT_7); + stringBuffer.append(TEXT_3); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_8); + stringBuffer.append(TEXT_7); stringBuffer.append(metamodelName); - stringBuffer.append(TEXT_9); + stringBuffer.append(TEXT_8); if (location != null) { stringBuffer.append(location); } } - stringBuffer.append(TEXT_10); + stringBuffer.append(TEXT_9); for (String libraryName : content.getAllLibrariesNames()) { String location = content.getLibraryLocations().get(libraryName); - stringBuffer.append(TEXT_11); + stringBuffer.append(TEXT_3); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_12); + stringBuffer.append(TEXT_10); stringBuffer.append(libraryName); - stringBuffer.append(TEXT_13); + stringBuffer.append(TEXT_8); if (location != null) { stringBuffer.append(new Path(location).lastSegment()); } } - stringBuffer.append(TEXT_14); + stringBuffer.append(TEXT_11); for (Entry<String, String> entry : content.getOptions().entrySet()) { - stringBuffer.append(TEXT_15); + stringBuffer.append(TEXT_3); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_16); + stringBuffer.append(TEXT_12); stringBuffer.append(entry.getKey()); - stringBuffer.append(TEXT_17); + stringBuffer.append(TEXT_8); stringBuffer.append(entry.getValue()); } - stringBuffer.append(TEXT_18); - stringBuffer.append(TEXT_19); + stringBuffer.append(TEXT_3); + stringBuffer.append(TEXT_3); return stringBuffer.toString(); } } diff --git a/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateRunnableJavaWriter.java b/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateRunnableJavaWriter.java index 3728dcb9..ddf8bc0e 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateRunnableJavaWriter.java +++ b/plugins/org.eclipse.m2m.atl.adt/src-gen/org/eclipse/m2m/atl/adt/runner/CreateRunnableJavaWriter.java @@ -14,7 +14,7 @@ public class CreateRunnableJavaWriter } public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; - protected final String TEXT_1 = "/*******************************************************************************" + NL + " * Copyright (c) 2010, 2012 Obeo." + NL + " * All rights reserved. This program and the accompanying materials" + NL + " * are made available under the terms of the Eclipse Public License v1.0" + NL + " * which accompanies this distribution, and is available at" + NL + " * http://www.eclipse.org/legal/epl-v10.html" + NL + " * " + NL + " * Contributors:" + NL + " * Obeo - initial API and implementation" + NL + " *******************************************************************************/" + NL + "package "; + protected final String TEXT_1 = "/*******************************************************************************" + NL + " * Copyright (c) 2010, 2012 Obeo." + NL + " * All rights reserved. This program and the accompanying materials" + NL + " * are made available under the terms of the Eclipse Public License v2.0" + NL + " * which accompanies this distribution, and is available at" + NL + " * https://www.eclipse.org/legal/epl-2.0/" + NL + " * " + NL + " * Contributors:" + NL + " * Obeo - initial API and implementation" + NL + " *******************************************************************************/" + NL + "package "; protected final String TEXT_2 = ";" + NL + "" + NL + "import java.io.IOException;" + NL + "import java.io.InputStream;" + NL + "import java.net.URL;" + NL + "import java.util.HashMap;" + NL + "import java.util.Map;" + NL + "import java.util.Properties;" + NL + "import java.util.Map.Entry;" + NL + "" + NL + "import org.eclipse.core.runtime.FileLocator;" + NL + "import org.eclipse.core.runtime.IProgressMonitor;" + NL + "import org.eclipse.core.runtime.NullProgressMonitor;" + NL + "import org.eclipse.core.runtime.Path;" + NL + "import org.eclipse.core.runtime.Platform;"; protected final String TEXT_3 = NL + "import org.eclipse.emf.ecore.EPackage;"; protected final String TEXT_4 = NL + "import org.eclipse.emf.ecore.resource.Resource;" + NL + "import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;"; @@ -41,99 +41,68 @@ public class CreateRunnableJavaWriter protected final String TEXT_25 = "();" + NL + "\t\t\t\trunner.loadModels("; protected final String TEXT_26 = "args["; protected final String TEXT_27 = "]"; - protected final String TEXT_28 = ", "; - protected final String TEXT_29 = ");"; - protected final String TEXT_30 = NL + "\t\t\t\tSystem.out.println(runner.do"; - protected final String TEXT_31 = "(new NullProgressMonitor()));"; - protected final String TEXT_32 = NL + "\t\t\t\trunner.do"; - protected final String TEXT_33 = "(new NullProgressMonitor());"; - protected final String TEXT_34 = NL + "\t\t\t\trunner.saveModels("; - protected final String TEXT_35 = "args["; - protected final String TEXT_36 = "]"; - protected final String TEXT_37 = ", "; - protected final String TEXT_38 = ");"; - protected final String TEXT_39 = NL + "\t\t\t}"; - protected final String TEXT_40 = NL + "\t\t\tSystem.out.println(new "; - protected final String TEXT_41 = "().do"; - protected final String TEXT_42 = "(new NullProgressMonitor()));"; - protected final String TEXT_43 = NL + "\t\t} catch (ATLCoreException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t} catch (IOException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t} catch (ATLExecutionException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Constructor." + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_44 = "() throws IOException {" + NL + "\t\tproperties = new Properties();" + NL + "\t\tproperties.load(getFileURL(\""; - protected final String TEXT_45 = ".properties\").openStream());"; - protected final String TEXT_46 = NL + "\t\tEPackage.Registry.INSTANCE.put(getMetamodelUri(\""; - protected final String TEXT_47 = "\"), "; - protected final String TEXT_48 = ".eINSTANCE);"; - protected final String TEXT_49 = NL + "\t\tResource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(\"ecore\", new EcoreResourceFactoryImpl());"; - protected final String TEXT_50 = NL + "\t}"; - protected final String TEXT_51 = NL + "\t" + NL + "\t/**" + NL + "\t * Load the input and input/output models, initialize output models." + NL + "\t * "; - protected final String TEXT_52 = NL + "\t * @param "; - protected final String TEXT_53 = "ModelPath" + NL + "\t * the "; - protected final String TEXT_54 = " model path"; - protected final String TEXT_55 = NL + "\t * @throws ATLCoreException" + NL + "\t * if a problem occurs while loading models" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void loadModels("; - protected final String TEXT_56 = "String "; - protected final String TEXT_57 = "ModelPath"; - protected final String TEXT_58 = ", "; - protected final String TEXT_59 = ") throws ATLCoreException {" + NL + "\t\tModelFactory factory = new EMFModelFactory();" + NL + "\t\tIInjector injector = new EMFInjector();"; - protected final String TEXT_60 = NL + "\t\tIReferenceModel "; - protected final String TEXT_61 = "Metamodel = factory.getMetametamodel();"; - protected final String TEXT_62 = NL + "\t \tIReferenceModel "; - protected final String TEXT_63 = "Metamodel = factory.newReferenceModel();" + NL + "\t\tinjector.inject("; - protected final String TEXT_64 = "Metamodel, getMetamodelUri(\""; - protected final String TEXT_65 = "\"));"; - protected final String TEXT_66 = NL + "\t\tthis."; - protected final String TEXT_67 = "Model = factory.newModel("; - protected final String TEXT_68 = "Metamodel);" + NL + "\t\tinjector.inject("; - protected final String TEXT_69 = "Model, "; - protected final String TEXT_70 = "ModelPath);"; - protected final String TEXT_71 = NL + "\t\tthis."; - protected final String TEXT_72 = "Model = factory.newModel("; - protected final String TEXT_73 = "Metamodel);" + NL + "\t\tinjector.inject("; - protected final String TEXT_74 = "Model, "; - protected final String TEXT_75 = "ModelPath);"; - protected final String TEXT_76 = NL + "\t\tthis."; - protected final String TEXT_77 = "Model = factory.newModel("; - protected final String TEXT_78 = "Metamodel);"; - protected final String TEXT_79 = NL + "\t\tIReferenceModel refiningTraceMetamodel = factory.getBuiltInResource(\"RefiningTrace.ecore\");" + NL + "\t\trefiningTraceModel = factory.newModel(refiningTraceMetamodel);"; - protected final String TEXT_80 = NL + "\t}"; - protected final String TEXT_81 = NL + "\t" + NL + "\t/**" + NL + "\t * Save the output and input/output models." + NL + "\t * "; - protected final String TEXT_82 = NL + "\t * @param "; - protected final String TEXT_83 = "ModelPath" + NL + "\t * the "; - protected final String TEXT_84 = " model path"; - protected final String TEXT_85 = NL + "\t * @throws ATLCoreException" + NL + "\t * if a problem occurs while saving models" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void saveModels("; - protected final String TEXT_86 = "String "; - protected final String TEXT_87 = "ModelPath"; - protected final String TEXT_88 = ", "; - protected final String TEXT_89 = ") throws ATLCoreException {" + NL + "\t\tIExtractor extractor = new EMFExtractor();"; - protected final String TEXT_90 = NL + "\t\textractor.extract("; - protected final String TEXT_91 = "Model, "; - protected final String TEXT_92 = "ModelPath);"; - protected final String TEXT_93 = NL + "\t}"; - protected final String TEXT_94 = NL + NL + "\t/**" + NL + "\t * Transform the models." + NL + "\t * " + NL + "\t * @param monitor" + NL + "\t * the progress monitor" + NL + "\t * @throws ATLCoreException" + NL + "\t * if an error occurs during models handling" + NL + "\t * @throws IOException" + NL + "\t * if a module cannot be read" + NL + "\t * @throws ATLExecutionException" + NL + "\t * if an error occurs during the execution" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object do"; - protected final String TEXT_95 = "(IProgressMonitor monitor) throws ATLCoreException, IOException, ATLExecutionException {" + NL + "\t\tILauncher launcher = new EMFVMLauncher();" + NL + "\t\tMap<String, Object> launcherOptions = getOptions();" + NL + "\t\tlauncher.initialize(launcherOptions);"; - protected final String TEXT_96 = NL + "\t\tlauncher.addInModel("; - protected final String TEXT_97 = "Model, \""; - protected final String TEXT_98 = "\", \""; - protected final String TEXT_99 = "\");"; - protected final String TEXT_100 = NL + "\t\tlauncher.addInOutModel("; - protected final String TEXT_101 = "Model, \""; - protected final String TEXT_102 = "\", \""; - protected final String TEXT_103 = "\");"; - protected final String TEXT_104 = NL + "\t\tlauncher.addOutModel("; - protected final String TEXT_105 = "Model, \""; - protected final String TEXT_106 = "\", \""; - protected final String TEXT_107 = "\");"; - protected final String TEXT_108 = NL + "\t\tlauncher.addOutModel(refiningTraceModel, \"refiningTrace\", \"RefiningTrace\");"; - protected final String TEXT_109 = NL + "\t\tlauncher.addLibrary(\""; - protected final String TEXT_110 = "\", getLibraryAsStream(\""; - protected final String TEXT_111 = "\"));"; - protected final String TEXT_112 = NL + "\t\treturn launcher.launch(\"run\", monitor, launcherOptions, (Object[]) getModulesList());" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Returns an Array of the module input streams, parameterized by the" + NL + "\t * property file." + NL + "\t * " + NL + "\t * @return an Array of the module input streams" + NL + "\t * @throws IOException" + NL + "\t * if a module cannot be read" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected InputStream[] getModulesList() throws IOException {" + NL + "\t\tInputStream[] modules = null;" + NL + "\t\tString modulesList = properties.getProperty(\""; - protected final String TEXT_113 = ".modules\");" + NL + "\t\tif (modulesList != null) {" + NL + "\t\t\tString[] moduleNames = modulesList.split(\",\");" + NL + "\t\t\tmodules = new InputStream[moduleNames.length];" + NL + "\t\t\tfor (int i = 0; i < moduleNames.length; i++) {" + NL + "\t\t\t\tString asmModulePath = new Path(moduleNames[i].trim()).removeFileExtension().addFileExtension(\"asm\").toString();" + NL + "\t\t\t\tmodules[i] = getFileURL(asmModulePath).openStream();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn modules;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Returns the URI of the given metamodel, parameterized from the property file." + NL + "\t * " + NL + "\t * @param metamodelName" + NL + "\t * the metamodel name" + NL + "\t * @return the metamodel URI" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getMetamodelUri(String metamodelName) {" + NL + "\t\treturn properties.getProperty(\""; - protected final String TEXT_114 = ".metamodels.\" + metamodelName);" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Returns the file name of the given library, parameterized from the property file." + NL + "\t * " + NL + "\t * @param libraryName" + NL + "\t * the library name" + NL + "\t * @return the library file name" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected InputStream getLibraryAsStream(String libraryName) throws IOException {" + NL + "\t\treturn getFileURL(properties.getProperty(\""; - protected final String TEXT_115 = ".libraries.\" + libraryName)).openStream();" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Returns the options map, parameterized from the property file." + NL + "\t * " + NL + "\t * @return the options map" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected Map<String, Object> getOptions() {" + NL + "\t\tMap<String, Object> options = new HashMap<String, Object>();" + NL + "\t\tfor (Entry<Object, Object> entry : properties.entrySet()) {" + NL + "\t\t\tif (entry.getKey().toString().startsWith(\""; - protected final String TEXT_116 = ".options.\")) {" + NL + "\t\t\t\toptions.put(entry.getKey().toString().replaceFirst(\""; - protected final String TEXT_117 = ".options.\", \"\"), " + NL + "\t\t\t\tentry.getValue().toString());" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn options;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Finds the file in the plug-in. Returns the file URL." + NL + "\t * " + NL + "\t * @param fileName" + NL + "\t * the file name" + NL + "\t * @return the file URL" + NL + "\t * @throws IOException" + NL + "\t * if the file doesn't exist" + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected static URL getFileURL(String fileName) throws IOException {" + NL + "\t\tfinal URL fileURL;" + NL + "\t\tif (isEclipseRunning()) {" + NL + "\t\t\tURL resourceURL = "; - protected final String TEXT_118 = ".class.getResource(fileName);" + NL + "\t\t\tif (resourceURL != null) {" + NL + "\t\t\t\tfileURL = FileLocator.toFileURL(resourceURL);" + NL + "\t\t\t} else {" + NL + "\t\t\t\tfileURL = null;" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tfileURL = "; - protected final String TEXT_119 = ".class.getResource(fileName);" + NL + "\t\t}" + NL + "\t\tif (fileURL == null) {" + NL + "\t\t\tthrow new IOException(\"'\" + fileName + \"' not found\");" + NL + "\t\t} else {" + NL + "\t\t\treturn fileURL;" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Tests if eclipse is running." + NL + "\t * " + NL + "\t * @return <code>true</code> if eclipse is running" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static boolean isEclipseRunning() {" + NL + "\t\ttry {" + NL + "\t\t\treturn Platform.isRunning();" + NL + "\t\t} catch (Throwable exception) {" + NL + "\t\t\t// Assume that we aren't running." + NL + "\t\t}" + NL + "\t\treturn false;" + NL + "\t}" + NL + "}"; - protected final String TEXT_120 = NL; + protected final String TEXT_28 = ");"; + protected final String TEXT_29 = NL + "\t\t\t\tSystem.out.println(runner.do"; + protected final String TEXT_30 = "(new NullProgressMonitor()));"; + protected final String TEXT_31 = NL + "\t\t\t\trunner.do"; + protected final String TEXT_32 = "(new NullProgressMonitor());"; + protected final String TEXT_33 = NL + "\t\t\t\trunner.saveModels("; + protected final String TEXT_34 = NL + "\t\t\t}"; + protected final String TEXT_35 = NL + "\t\t\tSystem.out.println(new "; + protected final String TEXT_36 = "().do"; + protected final String TEXT_37 = NL + "\t\t} catch (ATLCoreException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t} catch (IOException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t} catch (ATLExecutionException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Constructor." + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_38 = "() throws IOException {" + NL + "\t\tproperties = new Properties();" + NL + "\t\tproperties.load(getFileURL(\""; + protected final String TEXT_39 = ".properties\").openStream());"; + protected final String TEXT_40 = NL + "\t\tEPackage.Registry.INSTANCE.put(getMetamodelUri(\""; + protected final String TEXT_41 = "\"), "; + protected final String TEXT_42 = ".eINSTANCE);"; + protected final String TEXT_43 = NL + "\t\tResource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(\"ecore\", new EcoreResourceFactoryImpl());"; + protected final String TEXT_44 = NL + "\t}"; + protected final String TEXT_45 = NL + "\t" + NL + "\t/**" + NL + "\t * Load the input and input/output models, initialize output models." + NL + "\t * "; + protected final String TEXT_46 = NL + "\t * @param "; + protected final String TEXT_47 = "ModelPath" + NL + "\t * the "; + protected final String TEXT_48 = " model path"; + protected final String TEXT_49 = NL + "\t * @throws ATLCoreException" + NL + "\t * if a problem occurs while loading models" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void loadModels("; + protected final String TEXT_50 = "String "; + protected final String TEXT_51 = "ModelPath"; + protected final String TEXT_52 = ") throws ATLCoreException {" + NL + "\t\tModelFactory factory = new EMFModelFactory();" + NL + "\t\tIInjector injector = new EMFInjector();"; + protected final String TEXT_53 = NL + "\t\tIReferenceModel "; + protected final String TEXT_54 = "Metamodel = factory.getMetametamodel();"; + protected final String TEXT_55 = NL + "\t \tIReferenceModel "; + protected final String TEXT_56 = "Metamodel = factory.newReferenceModel();" + NL + "\t\tinjector.inject("; + protected final String TEXT_57 = "Metamodel, getMetamodelUri(\""; + protected final String TEXT_58 = "\"));"; + protected final String TEXT_59 = NL + "\t\tthis."; + protected final String TEXT_60 = "Model = factory.newModel("; + protected final String TEXT_61 = "Metamodel);" + NL + "\t\tinjector.inject("; + protected final String TEXT_62 = "Model, "; + protected final String TEXT_63 = "ModelPath);"; + protected final String TEXT_64 = "Metamodel);"; + protected final String TEXT_65 = NL + "\t\tIReferenceModel refiningTraceMetamodel = factory.getBuiltInResource(\"RefiningTrace.ecore\");" + NL + "\t\trefiningTraceModel = factory.newModel(refiningTraceMetamodel);"; + protected final String TEXT_66 = NL + "\t" + NL + "\t/**" + NL + "\t * Save the output and input/output models." + NL + "\t * "; + protected final String TEXT_67 = NL + "\t * @throws ATLCoreException" + NL + "\t * if a problem occurs while saving models" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void saveModels("; + protected final String TEXT_68 = ") throws ATLCoreException {" + NL + "\t\tIExtractor extractor = new EMFExtractor();"; + protected final String TEXT_69 = NL + "\t\textractor.extract("; + protected final String TEXT_70 = NL + NL + "\t/**" + NL + "\t * Transform the models." + NL + "\t * " + NL + "\t * @param monitor" + NL + "\t * the progress monitor" + NL + "\t * @throws ATLCoreException" + NL + "\t * if an error occurs during models handling" + NL + "\t * @throws IOException" + NL + "\t * if a module cannot be read" + NL + "\t * @throws ATLExecutionException" + NL + "\t * if an error occurs during the execution" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object do"; + protected final String TEXT_71 = "(IProgressMonitor monitor) throws ATLCoreException, IOException, ATLExecutionException {" + NL + "\t\tILauncher launcher = new EMFVMLauncher();" + NL + "\t\tMap<String, Object> launcherOptions = getOptions();" + NL + "\t\tlauncher.initialize(launcherOptions);"; + protected final String TEXT_72 = NL + "\t\tlauncher.addInModel("; + protected final String TEXT_73 = "Model, \""; + protected final String TEXT_74 = "\", \""; + protected final String TEXT_75 = "\");"; + protected final String TEXT_76 = NL + "\t\tlauncher.addInOutModel("; + protected final String TEXT_77 = NL + "\t\tlauncher.addOutModel("; + protected final String TEXT_78 = NL + "\t\tlauncher.addOutModel(refiningTraceModel, \"refiningTrace\", \"RefiningTrace\");"; + protected final String TEXT_79 = NL + "\t\tlauncher.addLibrary(\""; + protected final String TEXT_80 = "\", getLibraryAsStream(\""; + protected final String TEXT_81 = NL + "\t\treturn launcher.launch(\"run\", monitor, launcherOptions, (Object[]) getModulesList());" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Returns an Array of the module input streams, parameterized by the" + NL + "\t * property file." + NL + "\t * " + NL + "\t * @return an Array of the module input streams" + NL + "\t * @throws IOException" + NL + "\t * if a module cannot be read" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected InputStream[] getModulesList() throws IOException {" + NL + "\t\tInputStream[] modules = null;" + NL + "\t\tString modulesList = properties.getProperty(\""; + protected final String TEXT_82 = ".modules\");" + NL + "\t\tif (modulesList != null) {" + NL + "\t\t\tString[] moduleNames = modulesList.split(\",\");" + NL + "\t\t\tmodules = new InputStream[moduleNames.length];" + NL + "\t\t\tfor (int i = 0; i < moduleNames.length; i++) {" + NL + "\t\t\t\tString asmModulePath = new Path(moduleNames[i].trim()).removeFileExtension().addFileExtension(\"asm\").toString();" + NL + "\t\t\t\tmodules[i] = getFileURL(asmModulePath).openStream();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn modules;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Returns the URI of the given metamodel, parameterized from the property file." + NL + "\t * " + NL + "\t * @param metamodelName" + NL + "\t * the metamodel name" + NL + "\t * @return the metamodel URI" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getMetamodelUri(String metamodelName) {" + NL + "\t\treturn properties.getProperty(\""; + protected final String TEXT_83 = ".metamodels.\" + metamodelName);" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Returns the file name of the given library, parameterized from the property file." + NL + "\t * " + NL + "\t * @param libraryName" + NL + "\t * the library name" + NL + "\t * @return the library file name" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected InputStream getLibraryAsStream(String libraryName) throws IOException {" + NL + "\t\treturn getFileURL(properties.getProperty(\""; + protected final String TEXT_84 = ".libraries.\" + libraryName)).openStream();" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Returns the options map, parameterized from the property file." + NL + "\t * " + NL + "\t * @return the options map" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected Map<String, Object> getOptions() {" + NL + "\t\tMap<String, Object> options = new HashMap<String, Object>();" + NL + "\t\tfor (Entry<Object, Object> entry : properties.entrySet()) {" + NL + "\t\t\tif (entry.getKey().toString().startsWith(\""; + protected final String TEXT_85 = ".options.\")) {" + NL + "\t\t\t\toptions.put(entry.getKey().toString().replaceFirst(\""; + protected final String TEXT_86 = ".options.\", \"\"), " + NL + "\t\t\t\tentry.getValue().toString());" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn options;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * Finds the file in the plug-in. Returns the file URL." + NL + "\t * " + NL + "\t * @param fileName" + NL + "\t * the file name" + NL + "\t * @return the file URL" + NL + "\t * @throws IOException" + NL + "\t * if the file doesn't exist" + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected static URL getFileURL(String fileName) throws IOException {" + NL + "\t\tfinal URL fileURL;" + NL + "\t\tif (isEclipseRunning()) {" + NL + "\t\t\tURL resourceURL = "; + protected final String TEXT_87 = ".class.getResource(fileName);" + NL + "\t\t\tif (resourceURL != null) {" + NL + "\t\t\t\tfileURL = FileLocator.toFileURL(resourceURL);" + NL + "\t\t\t} else {" + NL + "\t\t\t\tfileURL = null;" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tfileURL = "; + protected final String TEXT_88 = ".class.getResource(fileName);" + NL + "\t\t}" + NL + "\t\tif (fileURL == null) {" + NL + "\t\t\tthrow new IOException(\"'\" + fileName + \"' not found\");" + NL + "\t\t} else {" + NL + "\t\t\treturn fileURL;" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Tests if eclipse is running." + NL + "\t * " + NL + "\t * @return <code>true</code> if eclipse is running" + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static boolean isEclipseRunning() {" + NL + "\t\ttry {" + NL + "\t\t\treturn Platform.isRunning();" + NL + "\t\t} catch (Throwable exception) {" + NL + "\t\t\t// Assume that we aren't running." + NL + "\t\t}" + NL + "\t\treturn false;" + NL + "\t}" + NL + "}"; + protected final String TEXT_89 = NL; public String generate(Object argument) { @@ -201,210 +170,210 @@ public class CreateRunnableJavaWriter stringBuffer.append(content.getAllModelsNames().indexOf(modelName)); stringBuffer.append(TEXT_27); if (i.hasNext()) { - stringBuffer.append(TEXT_28); + stringBuffer.append(TEXT_21); } } - stringBuffer.append(TEXT_29); + stringBuffer.append(TEXT_28); } if (content.isQuery()) { - stringBuffer.append(TEXT_30); + stringBuffer.append(TEXT_29); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_31); + stringBuffer.append(TEXT_30); } else { - stringBuffer.append(TEXT_32); + stringBuffer.append(TEXT_31); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_33); + stringBuffer.append(TEXT_32); } if (!content.getModelsToSaveNames().isEmpty()) { - stringBuffer.append(TEXT_34); + stringBuffer.append(TEXT_33); for (Iterator<String> i = content.getModelsToSaveNames().iterator(); i.hasNext(); ) { String modelName = i.next(); - stringBuffer.append(TEXT_35); + stringBuffer.append(TEXT_26); stringBuffer.append(content.getAllModelsNames().indexOf(modelName)); - stringBuffer.append(TEXT_36); + stringBuffer.append(TEXT_27); if (i.hasNext()) { - stringBuffer.append(TEXT_37); + stringBuffer.append(TEXT_21); } } - stringBuffer.append(TEXT_38); + stringBuffer.append(TEXT_28); } - stringBuffer.append(TEXT_39); + stringBuffer.append(TEXT_34); } else { - stringBuffer.append(TEXT_40); + stringBuffer.append(TEXT_35); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_41); + stringBuffer.append(TEXT_36); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_42); + stringBuffer.append(TEXT_30); } - stringBuffer.append(TEXT_43); + stringBuffer.append(TEXT_37); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_44); + stringBuffer.append(TEXT_38); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_45); + stringBuffer.append(TEXT_39); for (String metamodelName : content.getAllMetamodelsNames()) { String packageClassName = pluginContent.getPackageClassNames().get(metamodelName); if (!content.isMetametamodel(metamodelName) && packageClassName != null) { - stringBuffer.append(TEXT_46); + stringBuffer.append(TEXT_40); stringBuffer.append(metamodelName); - stringBuffer.append(TEXT_47); + stringBuffer.append(TEXT_41); stringBuffer.append(packageClassName); - stringBuffer.append(TEXT_48); + stringBuffer.append(TEXT_42); } } if (!content.getAllModelsNames().isEmpty()) { - stringBuffer.append(TEXT_49); + stringBuffer.append(TEXT_43); } - stringBuffer.append(TEXT_50); + stringBuffer.append(TEXT_44); if (!content.getModelsToLoadNames().isEmpty()) { - stringBuffer.append(TEXT_51); + stringBuffer.append(TEXT_45); for (Iterator<String> i = content.getModelsToLoadNames().iterator(); i.hasNext();) { String modelName = i.next(); - stringBuffer.append(TEXT_52); + stringBuffer.append(TEXT_46); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_53); + stringBuffer.append(TEXT_47); stringBuffer.append(modelName); - stringBuffer.append(TEXT_54); + stringBuffer.append(TEXT_48); } - stringBuffer.append(TEXT_55); + stringBuffer.append(TEXT_49); for (Iterator<String> i = content.getModelsToLoadNames().iterator(); i.hasNext(); ) { - stringBuffer.append(TEXT_56); + stringBuffer.append(TEXT_50); stringBuffer.append(i.next().toLowerCase()); - stringBuffer.append(TEXT_57); + stringBuffer.append(TEXT_51); if (i.hasNext()) { - stringBuffer.append(TEXT_58); + stringBuffer.append(TEXT_21); } } - stringBuffer.append(TEXT_59); + stringBuffer.append(TEXT_52); for (String metamodelName : content.getAllMetamodelsNames()) { if (content.isMetametamodel(metamodelName)) { - stringBuffer.append(TEXT_60); + stringBuffer.append(TEXT_53); stringBuffer.append(metamodelName.toLowerCase()); - stringBuffer.append(TEXT_61); + stringBuffer.append(TEXT_54); } else { - stringBuffer.append(TEXT_62); + stringBuffer.append(TEXT_55); stringBuffer.append(metamodelName.toLowerCase()); - stringBuffer.append(TEXT_63); + stringBuffer.append(TEXT_56); stringBuffer.append(metamodelName.toLowerCase()); - stringBuffer.append(TEXT_64); + stringBuffer.append(TEXT_57); stringBuffer.append(metamodelName); - stringBuffer.append(TEXT_65); + stringBuffer.append(TEXT_58); } } for (Iterator<String> i = content.getInModels().keySet().iterator(); i.hasNext(); ) { String modelName = i.next(); - stringBuffer.append(TEXT_66); + stringBuffer.append(TEXT_59); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_67); + stringBuffer.append(TEXT_60); stringBuffer.append(content.getInModels().get(modelName).toLowerCase()); - stringBuffer.append(TEXT_68); + stringBuffer.append(TEXT_61); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_69); + stringBuffer.append(TEXT_62); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_70); + stringBuffer.append(TEXT_63); } for (Iterator<String> i = content.getInOutModels().keySet().iterator(); i.hasNext(); ) { String modelName = i.next(); - stringBuffer.append(TEXT_71); + stringBuffer.append(TEXT_59); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_72); + stringBuffer.append(TEXT_60); stringBuffer.append(content.getInOutModels().get(modelName).toLowerCase()); - stringBuffer.append(TEXT_73); + stringBuffer.append(TEXT_61); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_74); + stringBuffer.append(TEXT_62); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_75); + stringBuffer.append(TEXT_63); } for (Iterator<String> i = content.getOutModels().keySet().iterator(); i.hasNext(); ) { String modelName = i.next(); - stringBuffer.append(TEXT_76); + stringBuffer.append(TEXT_59); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_77); + stringBuffer.append(TEXT_60); stringBuffer.append(content.getOutModels().get(modelName).toLowerCase()); - stringBuffer.append(TEXT_78); + stringBuffer.append(TEXT_64); } if (content.isRefining()) { - stringBuffer.append(TEXT_79); + stringBuffer.append(TEXT_65); } - stringBuffer.append(TEXT_80); + stringBuffer.append(TEXT_44); } if (!content.getModelsToSaveNames().isEmpty()) { - stringBuffer.append(TEXT_81); + stringBuffer.append(TEXT_66); for (Iterator<String> i = content.getModelsToSaveNames().iterator(); i.hasNext();) { String modelName = i.next(); - stringBuffer.append(TEXT_82); + stringBuffer.append(TEXT_46); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_83); + stringBuffer.append(TEXT_47); stringBuffer.append(modelName); - stringBuffer.append(TEXT_84); + stringBuffer.append(TEXT_48); } - stringBuffer.append(TEXT_85); + stringBuffer.append(TEXT_67); for (Iterator<String> i = content.getModelsToSaveNames().iterator(); i.hasNext(); ) { - stringBuffer.append(TEXT_86); + stringBuffer.append(TEXT_50); stringBuffer.append(i.next().toLowerCase()); - stringBuffer.append(TEXT_87); + stringBuffer.append(TEXT_51); if (i.hasNext()) { - stringBuffer.append(TEXT_88); + stringBuffer.append(TEXT_21); } } - stringBuffer.append(TEXT_89); + stringBuffer.append(TEXT_68); for (Iterator<String> i = content.getModelsToSaveNames().iterator(); i.hasNext();) { String modelName = i.next(); - stringBuffer.append(TEXT_90); + stringBuffer.append(TEXT_69); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_91); + stringBuffer.append(TEXT_62); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_92); + stringBuffer.append(TEXT_63); } - stringBuffer.append(TEXT_93); + stringBuffer.append(TEXT_44); } - stringBuffer.append(TEXT_94); + stringBuffer.append(TEXT_70); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_95); + stringBuffer.append(TEXT_71); for (Iterator<String> i = content.getInModels().keySet().iterator(); i.hasNext(); ) { String modelName = i.next(); - stringBuffer.append(TEXT_96); + stringBuffer.append(TEXT_72); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_97); + stringBuffer.append(TEXT_73); stringBuffer.append(modelName); - stringBuffer.append(TEXT_98); + stringBuffer.append(TEXT_74); stringBuffer.append(content.getInModels().get(modelName)); - stringBuffer.append(TEXT_99); + stringBuffer.append(TEXT_75); } for (Iterator<String> i = content.getInOutModels().keySet().iterator(); i.hasNext(); ) { String modelName = i.next(); - stringBuffer.append(TEXT_100); + stringBuffer.append(TEXT_76); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_101); + stringBuffer.append(TEXT_73); stringBuffer.append(modelName); - stringBuffer.append(TEXT_102); + stringBuffer.append(TEXT_74); stringBuffer.append(content.getInOutModels().get(modelName)); - stringBuffer.append(TEXT_103); + stringBuffer.append(TEXT_75); } for (Iterator<String> i = content.getOutModels().keySet().iterator(); i.hasNext(); ) { String modelName = i.next(); - stringBuffer.append(TEXT_104); + stringBuffer.append(TEXT_77); stringBuffer.append(modelName.toLowerCase()); - stringBuffer.append(TEXT_105); + stringBuffer.append(TEXT_73); stringBuffer.append(modelName); - stringBuffer.append(TEXT_106); + stringBuffer.append(TEXT_74); stringBuffer.append(content.getOutModels().get(modelName)); - stringBuffer.append(TEXT_107); + stringBuffer.append(TEXT_75); } if (content.isRefining()) { - stringBuffer.append(TEXT_108); + stringBuffer.append(TEXT_78); } for (String libraryName : content.getAllLibrariesNames()) { - stringBuffer.append(TEXT_109); + stringBuffer.append(TEXT_79); stringBuffer.append(libraryName); - stringBuffer.append(TEXT_110); + stringBuffer.append(TEXT_80); stringBuffer.append(libraryName); - stringBuffer.append(TEXT_111); + stringBuffer.append(TEXT_58); } - stringBuffer.append(TEXT_112); + stringBuffer.append(TEXT_81); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_113); + stringBuffer.append(TEXT_82); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_114); + stringBuffer.append(TEXT_83); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_115); + stringBuffer.append(TEXT_84); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_116); + stringBuffer.append(TEXT_85); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_117); + stringBuffer.append(TEXT_86); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_118); + stringBuffer.append(TEXT_87); stringBuffer.append(content.getClassShortName()); - stringBuffer.append(TEXT_119); - stringBuffer.append(TEXT_120); + stringBuffer.append(TEXT_88); + stringBuffer.append(TEXT_89); return stringBuffer.toString(); } } diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AdtPlugin.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AdtPlugin.java index 0b2bc62e..53277d2d 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AdtPlugin.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AdtPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlBuildVisitor.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlBuildVisitor.java index 94f5229b..01a27db1 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlBuildVisitor.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlBuildVisitor.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 INRIA. * Copyright (c) 2017 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlBuilder.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlBuilder.java index 1a9453f2..e19138a8 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlBuilder.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlBuilder.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlCleanVisitor.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlCleanVisitor.java index 55ec9236..80b93d2e 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlCleanVisitor.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlCleanVisitor.java @@ -2,9 +2,9 @@ * Copyright (c) 2007 INRIA. * Copyright (c) 2017 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlNature.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlNature.java index ac416501..00694bd6 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlNature.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlNature.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlResourceVisitor.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlResourceVisitor.java index b3e0118a..5ae894aa 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlResourceVisitor.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/AtlResourceVisitor.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 INRIA. * Copyright (c) 2017 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/Messages.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/Messages.java index 9c3b85b4..776df2b0 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/Messages.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/messages.properties b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/messages.properties index c0a99787..817ff162 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/messages.properties +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/ATLProperties.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/ATLProperties.java index 61eb6f26..3ddb2e90 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/ATLProperties.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/ATLProperties.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreatePluginData.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreatePluginData.java index f516a7e0..91745fe0 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreatePluginData.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreatePluginData.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreateRunnableAtlOperation.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreateRunnableAtlOperation.java index eeb129b7..882b4cbe 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreateRunnableAtlOperation.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreateRunnableAtlOperation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreateRunnableData.java b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreateRunnableData.java index 6fb61886..5bd8b2d7 100644 --- a/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreateRunnableData.java +++ b/plugins/org.eclipse.m2m.atl.adt/src/org/eclipse/m2m/atl/adt/runner/CreateRunnableData.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/templates/createModuleActivatorWriter.jet b/plugins/org.eclipse.m2m.atl.adt/templates/createModuleActivatorWriter.jet index b43534cd..0c1a406a 100644 --- a/plugins/org.eclipse.m2m.atl.adt/templates/createModuleActivatorWriter.jet +++ b/plugins/org.eclipse.m2m.atl.adt/templates/createModuleActivatorWriter.jet @@ -9,9 +9,9 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.adt/templates/createRunnableJavaWriter.jet b/plugins/org.eclipse.m2m.atl.adt/templates/createRunnableJavaWriter.jet index df62160f..d184a3e6 100644 --- a/plugins/org.eclipse.m2m.atl.adt/templates/createRunnableJavaWriter.jet +++ b/plugins/org.eclipse.m2m.atl.adt/templates/createRunnableJavaWriter.jet @@ -10,9 +10,9 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.common/.settings/org.eclipse.jdt.ui.prefs index 46d0535a..3811a1c3 100644 --- a/plugins/org.eclipse.m2m.atl.common/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.common/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2008, 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/\r\n${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2008, 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/\r\n${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.common/META-INF/MANIFEST.MF index 23bc73e1..6d0a2ee4 100644 --- a/plugins/org.eclipse.m2m.atl.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.common/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.common;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.m2m.atl.common, diff --git a/plugins/org.eclipse.m2m.atl.common/about.html b/plugins/org.eclipse.m2m.atl.common/about.html index c9143d21..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.common/about.html +++ b/plugins/org.eclipse.m2m.atl.common/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>December 7, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.common/build.properties b/plugins/org.eclipse.m2m.atl.common/build.properties index 3b3f6007..67d43345 100644 --- a/plugins/org.eclipse.m2m.atl.common/build.properties +++ b/plugins/org.eclipse.m2m.atl.common/build.properties @@ -1,8 +1,8 @@ # Copyright (c) 2008, 2012, 2015 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.common/deploy/release/pom.xml index aa849f46..093acbe7 100644 --- a/plugins/org.eclipse.m2m.atl.common/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.common/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.common</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.common/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.common/deploy/snapshot/pom.xml index 84aee78b..9d52129c 100644 --- a/plugins/org.eclipse.m2m.atl.common/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.common/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.common</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.common/model/ATL.genmodel b/plugins/org.eclipse.m2m.atl.common/model/ATL.genmodel index c21ff407..ed19d61e 100644 --- a/plugins/org.eclipse.m2m.atl.common/model/ATL.genmodel +++ b/plugins/org.eclipse.m2m.atl.common/model/ATL.genmodel @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008, 2012, 2015 Obeo.
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:
 Obeo - initial API and implementation
 Dennis Wagelaar (Vrije Universiteit Brussel)" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008, 2012, 2015 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-2.0/

Contributors:
 Obeo - initial API and implementation
 Dennis Wagelaar (Vrije Universiteit Brussel)" modelDirectory="/org.eclipse.m2m.atl.common/src" modelPluginID="org.eclipse.m2m.atl.common" modelName="ATL" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" suppressInterfaces="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" diff --git a/plugins/org.eclipse.m2m.atl.common/model/Problem.genmodel b/plugins/org.eclipse.m2m.atl.common/model/Problem.genmodel index 6cf8fdbf..1de501a6 100644 --- a/plugins/org.eclipse.m2m.atl.common/model/Problem.genmodel +++ b/plugins/org.eclipse.m2m.atl.common/model/Problem.genmodel @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008, 2012, 2015 Obeo.
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:
 Obeo - initial API and implementation
 Dennis Wagelaar (Vrije Universiteit Brussel)" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008, 2012, 2015 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-2.0/

Contributors:
 Obeo - initial API and implementation
 Dennis Wagelaar (Vrije Universiteit Brussel)" modelDirectory="/org.eclipse.m2m.atl.common/src" modelPluginID="org.eclipse.m2m.atl.common" modelName="Problem" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" suppressInterfaces="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" diff --git a/plugins/org.eclipse.m2m.atl.common/plugin.xml b/plugins/org.eclipse.m2m.atl.common/plugin.xml index d3b546d8..5074cfc2 100644 --- a/plugins/org.eclipse.m2m.atl.common/plugin.xml +++ b/plugins/org.eclipse.m2m.atl.common/plugin.xml @@ -4,9 +4,9 @@ <!-- Copyright (c) 2008, 2012, 2015 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/pom.xml b/plugins/org.eclipse.m2m.atl.common/pom.xml index 716d9f5d..b34291f2 100644 --- a/plugins/org.eclipse.m2m.atl.common/pom.xml +++ b/plugins/org.eclipse.m2m.atl.common/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.common</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ATLFactory.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ATLFactory.java index 9d6a2359..85428e48 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ATLFactory.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ATLFactory.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ATLPackage.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ATLPackage.java index 053fe1c3..d006f3c0 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ATLPackage.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ATLPackage.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ActionBlock.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ActionBlock.java index 62333fe1..280a988c 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ActionBlock.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ActionBlock.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Binding.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Binding.java index 06388be5..763d7c48 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Binding.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Binding.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/BindingStat.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/BindingStat.java index c692a79f..71b3fc4b 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/BindingStat.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/BindingStat.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/CalledRule.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/CalledRule.java index 42683790..a64e236e 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/CalledRule.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/CalledRule.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/DropPattern.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/DropPattern.java index 211a6770..ce2e5894 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/DropPattern.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/DropPattern.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ExpressionStat.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ExpressionStat.java index 25af26f3..7c3f2bea 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ExpressionStat.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ExpressionStat.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ForEachOutPatternElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ForEachOutPatternElement.java index 9fc1bdb9..48603013 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ForEachOutPatternElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ForEachOutPatternElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ForStat.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ForStat.java index 7f0e70c3..fa3612b4 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ForStat.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ForStat.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Helper.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Helper.java index e6d0982d..6532a0d8 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Helper.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Helper.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/IfStat.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/IfStat.java index 87c45976..7c7d2d9f 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/IfStat.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/IfStat.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/InPattern.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/InPattern.java index 1a43ea5e..d83d78a9 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/InPattern.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/InPattern.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/InPatternElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/InPatternElement.java index 564a2c0f..812e82ca 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/InPatternElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/InPatternElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LazyMatchedRule.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LazyMatchedRule.java index 6d106ec4..d7ab4d1a 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LazyMatchedRule.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LazyMatchedRule.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Library.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Library.java index c6b62228..a53d08da 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Library.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Library.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LibraryRef.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LibraryRef.java index 2db85b24..ec54bf2f 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LibraryRef.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LibraryRef.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LocatedElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LocatedElement.java index 7a7b22dd..e602b210 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LocatedElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/LocatedElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/MatchedRule.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/MatchedRule.java index 8ee6b3b7..7a9d6091 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/MatchedRule.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/MatchedRule.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Module.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Module.java index c657c11d..941b0b07 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Module.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Module.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ModuleElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ModuleElement.java index af0fdd4a..4a8945c0 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ModuleElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/ModuleElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/OutPattern.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/OutPattern.java index 6c709043..7f12bcc6 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/OutPattern.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/OutPattern.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/OutPatternElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/OutPatternElement.java index 2c9c9f55..653dd98c 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/OutPatternElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/OutPatternElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/PatternElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/PatternElement.java index e55ae68b..dc09d746 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/PatternElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/PatternElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Query.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Query.java index 12f54799..747d2f1b 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Query.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Query.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Rule.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Rule.java index 703b8353..fa135379 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Rule.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Rule.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/RuleVariableDeclaration.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/RuleVariableDeclaration.java index 88ec6897..140aabf3 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/RuleVariableDeclaration.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/RuleVariableDeclaration.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/SimpleInPatternElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/SimpleInPatternElement.java index 8928cf07..b39b5a68 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/SimpleInPatternElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/SimpleInPatternElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/SimpleOutPatternElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/SimpleOutPatternElement.java index b3729bdd..1d893960 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/SimpleOutPatternElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/SimpleOutPatternElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Statement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Statement.java index 448951a8..a449c40b 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Statement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Statement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Unit.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Unit.java index 2381ddfa..3dfe0391 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Unit.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/Unit.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/util/ATLAdapterFactory.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/util/ATLAdapterFactory.java index 2b17563b..c1beeb06 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/util/ATLAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/util/ATLAdapterFactory.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation @@ -95,7 +95,7 @@ public class ATLAdapterFactory extends AdapterFactoryImpl { return createQueryAdapter(); } @Override - public Adapter caseModule(Module object) { + public Adapter caseModule(org.eclipse.m2m.atl.common.ATL.Module object) { return createModuleAdapter(); } @Override diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/util/ATLSwitch.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/util/ATLSwitch.java index fd7f401a..cf99512b 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/util/ATLSwitch.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATL/util/ATLSwitch.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation @@ -124,7 +124,7 @@ public class ATLSwitch<T> { return result; } case ATLPackage.MODULE: { - Module module = (Module)theEObject; + org.eclipse.m2m.atl.common.ATL.Module module = (org.eclipse.m2m.atl.common.ATL.Module)theEObject; T result = caseModule(module); if (result == null) result = caseUnit(module); if (result == null) result = caseLocatedElement(module); @@ -402,7 +402,7 @@ public class ATLSwitch<T> { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseModule(Module object) { + public T caseModule(org.eclipse.m2m.atl.common.ATL.Module object) { return null; } diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLExecutionException.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLExecutionException.java index b377695e..66da7f19 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLExecutionException.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLExecutionException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLaunchConstants.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLaunchConstants.java index a1826c79..8c92f5b8 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLaunchConstants.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLaunchConstants.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLogFormatter.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLogFormatter.java index a563f141..10d35078 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLogFormatter.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLogFormatter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar (Vrije Universiteit Brussel) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLogger.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLogger.java index 6c5b738b..b5e88a60 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLogger.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLLogger.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLResourceProvider.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLResourceProvider.java index 21840afb..1e3c5a34 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLResourceProvider.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ATLResourceProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/AtlNbCharFile.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/AtlNbCharFile.java index 12b4bea9..0c9aeb51 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/AtlNbCharFile.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/AtlNbCharFile.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation @@ -21,7 +21,7 @@ import java.util.logging.Level; /** * This class is used by a stackframe to compute char position in a file With the file name and project name, * this structure build a list for each line the position of its first char and the position of the tabs. - * + * * @author <a href="mailto:freddy.allilaire@obeo.fr">Freddy Allilaire</a> */ public class AtlNbCharFile { @@ -31,7 +31,7 @@ public class AtlNbCharFile { /** * This class corresponding to the structure Line : for each line : index of first char and position of * tabs. - * + * * @author <a href="mailto:freddy.allilaire@obeo.fr">Freddy Allilaire</a> */ class Line { @@ -47,7 +47,7 @@ public class AtlNbCharFile { */ List<Integer> tabsWidth; - public Line(int indexFirstChar, List<Integer> indexTabs, List<Integer> tabsWidth) { + public Line(final int indexFirstChar, final List<Integer> indexTabs, final List<Integer> tabsWidth) { this.indexFirstChar = indexFirstChar; this.indexTabs = indexTabs; this.tabsWidth = tabsWidth; @@ -61,22 +61,22 @@ public class AtlNbCharFile { /** * The AtlNbCharFile constructor. - * + * * @param in * the input stream */ - public AtlNbCharFile(InputStream in) { + public AtlNbCharFile(final InputStream in) { computePosition(in); } /** * This is the main method which compute for each line of the file the index of the first char and the * index of the tabs. - * + * * @param is * the input stream */ - private void computePosition(InputStream is) { + private void computePosition(final InputStream is) { lines = new ArrayList<Line>(); try { @@ -121,7 +121,7 @@ public class AtlNbCharFile { * With the current line and index of the column this method returns the position to select in the file * For example, the debugUI needs to know the index the start char and the last char of the current * AtlStackFrame To compute start char and last char, AtlStackFrame calls this method. - * + * * @param lineNumber * the line number * @param column @@ -129,8 +129,9 @@ public class AtlNbCharFile { * @param tabWidth * the width of the tab * @return the position to select in the file + * @throws IndexOutOfBoundsException */ - private int getIndexChar(int lineNumber, int column, int tabWidth) { + private int getIndexChar(final int lineNumber, final int column, final int tabWidth) { int ret = 0; if (!((lineNumber == 1) && (column == 1))) { @@ -161,18 +162,18 @@ public class AtlNbCharFile { /** * Returns the index char in the source location. - * + * * @param sourceLocation * the source * @return the index char in the source location */ - public int[] getIndexChar(String sourceLocation) { + public int[] getIndexChar(final String sourceLocation) { return getIndexChar(sourceLocation, ANTLR_TAB_WIDTH); } /** * Returns an array of int: first element is startChar, second element is endChar. * - * + * * @param sourceLocation * the string representing "startLine:startColumn-endLine:endColumn" the location given by * antlr (tabs are 8 chars long) @@ -180,7 +181,7 @@ public class AtlNbCharFile { * the width of the tab * @return An array of int: first element is startChar, second element is endChar */ - public int[] getIndexChar(String sourceLocation, int tabWidth) { + public int[] getIndexChar(final String sourceLocation, final int tabWidth) { final int[] ret = new int[2]; int currentTabWidth = tabWidth; if (currentTabWidth < 0) { @@ -205,13 +206,15 @@ public class AtlNbCharFile { /** * Returns computes the char start position from the string "cursorLine:cursorColumn" given by Eclipse * (tabs are 4 chars long by default, but it is user-configurable). - * + * * @param cursorPosition * the string representing the cursor position * @return computes the char start position from the string "cursorLine:cursorColumn" given by Eclipse * (tabs are 4 chars long by default, but it is user-configurable) + * @throws NumberFormatException + * @throws IndexOutOfBoundsException */ - public int getIndex(String cursorPosition) { + public int getIndex(final String cursorPosition) { int ret = 0; final String[] starts = cursorPosition.split(":"); //$NON-NLS-1$ final int startLine = Integer.parseInt(starts[0].trim()); diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ConsoleStreamHandler.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ConsoleStreamHandler.java index 1c5fe0be..a2206103 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ConsoleStreamHandler.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/ConsoleStreamHandler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar (Vrije Universiteit Brussel) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/IAtlLexems.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/IAtlLexems.java index 2f64ca2a..21cfac38 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/IAtlLexems.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/IAtlLexems.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Attribute.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Attribute.java index d41188ec..5af075b3 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Attribute.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Attribute.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BagExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BagExp.java index 0a51fb5f..c3066f13 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BagExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BagExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BagType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BagType.java index bf524620..8f81eede 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BagType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BagType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BooleanExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BooleanExp.java index 11cd012b..202ef2e3 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BooleanExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BooleanExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BooleanType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BooleanType.java index 33c0b639..7e78cf62 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BooleanType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/BooleanType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionExp.java index 77d78aee..62319b69 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionOperationCallExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionOperationCallExp.java index e2d213e8..00dd6fab 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionOperationCallExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionOperationCallExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionType.java index 43cd76ad..f838b31c 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/CollectionType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/EnumLiteralExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/EnumLiteralExp.java index 97d02a91..bbdcfa9d 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/EnumLiteralExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/EnumLiteralExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IfExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IfExp.java index 3d122476..0ebd5786 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IfExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IfExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IntegerExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IntegerExp.java index 5fbd08a6..e5a8214b 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IntegerExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IntegerExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IntegerType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IntegerType.java index 72255847..1e8e4616 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IntegerType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IntegerType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IterateExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IterateExp.java index 94a070e7..56b99795 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IterateExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IterateExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Iterator.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Iterator.java index b895d2e5..89a1e439 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Iterator.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Iterator.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IteratorExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IteratorExp.java index 84746266..1be17962 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IteratorExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/IteratorExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/LetExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/LetExp.java index 8f2edc77..164d5c57 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/LetExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/LetExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/LoopExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/LoopExp.java index a593d6fd..7fcbf26d 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/LoopExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/LoopExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapElement.java index 634045db..1959eb18 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapExp.java index dc8bd7e8..4d4382a6 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapType.java index 553b5c22..56f3c50e 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/MapType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NavigationOrAttributeCallExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NavigationOrAttributeCallExp.java index 3e5cdf40..be431da1 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NavigationOrAttributeCallExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NavigationOrAttributeCallExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NumericExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NumericExp.java index 3f0e4f79..203898bf 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NumericExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NumericExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NumericType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NumericType.java index 62964b47..b26b359f 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NumericType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/NumericType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLFactory.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLFactory.java index 7c15e3c8..1a20c192 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLFactory.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLFactory.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLPackage.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLPackage.java index aaad8d86..db58ac06 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLPackage.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLPackage.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclAnyType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclAnyType.java index 2718ffd9..f3dafb87 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclAnyType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclAnyType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclContextDefinition.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclContextDefinition.java index 416b4076..aa6032f2 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclContextDefinition.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclContextDefinition.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclExpression.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclExpression.java index 3def42f2..2cc7f7ed 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclExpression.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclExpression.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclFeature.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclFeature.java index 398a786b..013c263f 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclFeature.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclFeature.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclFeatureDefinition.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclFeatureDefinition.java index fef3741b..ced7d856 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclFeatureDefinition.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclFeatureDefinition.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModel.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModel.java index 08ad847f..6c826315 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModel.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModel.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModelElement.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModelElement.java index 0f2c940c..f0fb10bd 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModelElement.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModelElement.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclType.java index 4e261c98..ec49e0bc 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclUndefinedExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclUndefinedExp.java index da49931c..02355475 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclUndefinedExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclUndefinedExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Operation.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Operation.java index ab17a2bc..5c3c8898 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Operation.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Operation.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OperationCallExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OperationCallExp.java index d611da08..d57dd10c 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OperationCallExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OperationCallExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OperatorCallExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OperatorCallExp.java index 25013067..b043b19d 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OperatorCallExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OperatorCallExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OrderedSetExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OrderedSetExp.java index 03c80ee3..cf7e3493 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OrderedSetExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OrderedSetExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OrderedSetType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OrderedSetType.java index 21287aa5..29e14b57 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OrderedSetType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OrderedSetType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Parameter.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Parameter.java index fbd1af93..8665b609 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Parameter.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Parameter.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Primitive.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Primitive.java index 3ea91f46..d9021770 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Primitive.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/Primitive.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/PrimitiveExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/PrimitiveExp.java index ff8235b0..45b9727c 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/PrimitiveExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/PrimitiveExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/PropertyCallExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/PropertyCallExp.java index 55b828eb..01e9030a 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/PropertyCallExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/PropertyCallExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/RealExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/RealExp.java index 7d263fe6..fec77818 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/RealExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/RealExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/RealType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/RealType.java index 594ef82e..c5824280 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/RealType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/RealType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SequenceExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SequenceExp.java index 4ac4b70a..0df23817 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SequenceExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SequenceExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SequenceType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SequenceType.java index b69c422f..a732085e 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SequenceType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SequenceType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SetExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SetExp.java index 0efbacf3..2c8a195b 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SetExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SetExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SetType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SetType.java index 22e320c3..dcebdf36 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SetType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SetType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/StringExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/StringExp.java index 482f90bb..1861d9fa 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/StringExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/StringExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/StringType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/StringType.java index 472257ce..42bb642f 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/StringType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/StringType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SuperExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SuperExp.java index c9fb3769..276464d0 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SuperExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/SuperExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleExp.java index 1ee0e7ab..e74288d8 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TuplePart.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TuplePart.java index fff2349c..2166e06a 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TuplePart.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TuplePart.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleType.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleType.java index aa289dbc..5f526251 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleType.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleType.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleTypeAttribute.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleTypeAttribute.java index 022a9b12..bb5b3a91 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleTypeAttribute.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/TupleTypeAttribute.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/VariableDeclaration.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/VariableDeclaration.java index 1d250061..7eadb5d1 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/VariableDeclaration.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/VariableDeclaration.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/VariableExp.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/VariableExp.java index 197af328..af52806e 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/VariableExp.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/VariableExp.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/util/OCLAdapterFactory.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/util/OCLAdapterFactory.java index c255fa59..380b30a6 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/util/OCLAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/util/OCLAdapterFactory.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/util/OCLSwitch.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/util/OCLSwitch.java index 5a99a8c0..52eef646 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/util/OCLSwitch.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/util/OCLSwitch.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/PrimitiveTypes/PrimitiveTypesFactory.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/PrimitiveTypes/PrimitiveTypesFactory.java index 57ef161c..37692e89 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/PrimitiveTypes/PrimitiveTypesFactory.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/PrimitiveTypes/PrimitiveTypesFactory.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/PrimitiveTypes/PrimitiveTypesPackage.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/PrimitiveTypes/PrimitiveTypesPackage.java index 811842de..c9fb7611 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/PrimitiveTypes/PrimitiveTypesPackage.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/PrimitiveTypes/PrimitiveTypesPackage.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/PrimitiveTypes/PrimitiveTypesFactory.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/PrimitiveTypes/PrimitiveTypesFactory.java index 900b906b..9b1385bd 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/PrimitiveTypes/PrimitiveTypesFactory.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/PrimitiveTypes/PrimitiveTypesFactory.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/PrimitiveTypes/PrimitiveTypesPackage.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/PrimitiveTypes/PrimitiveTypesPackage.java index 467622f5..a62e35d4 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/PrimitiveTypes/PrimitiveTypesPackage.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/PrimitiveTypes/PrimitiveTypesPackage.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/Problem.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/Problem.java index 6b728852..24663143 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/Problem.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/Problem.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/ProblemFactory.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/ProblemFactory.java index 51502db1..619be62f 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/ProblemFactory.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/ProblemFactory.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/ProblemPackage.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/ProblemPackage.java index ef5167d3..5dc62666 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/ProblemPackage.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/ProblemPackage.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/Severity.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/Severity.java index 82ba3c6a..832c983e 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/Severity.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/Severity.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/util/ProblemAdapterFactory.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/util/ProblemAdapterFactory.java index b90bc549..26ca5277 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/util/ProblemAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/util/ProblemAdapterFactory.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/util/ProblemSwitch.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/util/ProblemSwitch.java index 038f459b..acdd3f5f 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/util/ProblemSwitch.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/Problem/util/ProblemSwitch.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2012, 2015 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/internal/BundleUtil.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/internal/BundleUtil.java index 58928296..a69ac088 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/internal/BundleUtil.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/internal/BundleUtil.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2017 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/internal/BundleUtilImpl.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/internal/BundleUtilImpl.java index 25df6690..345958b9 100644 --- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/internal/BundleUtilImpl.java +++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/internal/BundleUtilImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2017 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.core.ant/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.core.ant/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.core.ant/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.core.ant/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.core.ant/META-INF/MANIFEST.MF index 86c8f285..608908fc 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.core.ant/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.core.ant;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime, org.apache.ant, diff --git a/plugins/org.eclipse.m2m.atl.core.ant/about.html b/plugins/org.eclipse.m2m.atl.core.ant/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/about.html +++ b/plugins/org.eclipse.m2m.atl.core.ant/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.core.ant/pom.xml b/plugins/org.eclipse.m2m.atl.core.ant/pom.xml index 2fda3312..9781c531 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/pom.xml +++ b/plugins/org.eclipse.m2m.atl.core.ant/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.core.ant</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/AtlBuildListener.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/AtlBuildListener.java index 6d3bfb64..4caa33e8 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/AtlBuildListener.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/AtlBuildListener.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Ant tooling diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/Messages.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/Messages.java index 47b2d899..2452626d 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/Messages.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/ProjectLogHandler.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/ProjectLogHandler.java index d375896e..8be245d5 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/ProjectLogHandler.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/ProjectLogHandler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Ant tooling diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/messages.properties b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/messages.properties index 4d9fa1d9..8b0b91e8 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/messages.properties +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/ATLModelTransformationTask.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/ATLModelTransformationTask.java index 5fe33c06..0ca35c23 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/ATLModelTransformationTask.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/ATLModelTransformationTask.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Ant tooling diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/AbstractAtlTask.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/AbstractAtlTask.java index b4c67f2f..f7c9aa87 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/AbstractAtlTask.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/AbstractAtlTask.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Ant tooling diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/LoadModelTask.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/LoadModelTask.java index e2d11fe0..454087d5 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/LoadModelTask.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/LoadModelTask.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Ant tooling diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/SaveModelTask.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/SaveModelTask.java index 245e054b..afac584c 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/SaveModelTask.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/SaveModelTask.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Ant tooling diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Classpath.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Classpath.java index d58bec4f..2e19ce9b 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Classpath.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Classpath.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Extractor.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Extractor.java index 0230c870..ef46a6ee 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Extractor.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Extractor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/InModel.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/InModel.java index ea40855e..6b8b7033 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/InModel.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/InModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Injector.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Injector.java index ef0722db..8ee422b8 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Injector.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Injector.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Library.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Library.java index fe4dbb4d..7f5dbaaf 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Library.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Library.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/OutModel.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/OutModel.java index 65787ec6..0b5fefa8 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/OutModel.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/OutModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Param.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Param.java index 524f58cd..066df0a0 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Param.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Param.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Pathelement.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Pathelement.java index 1c6f2211..570f9eba 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Pathelement.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Pathelement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Superimpose.java b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Superimpose.java index a183d4bd..b091a0db 100644 --- a/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Superimpose.java +++ b/plugins/org.eclipse.m2m.atl.core.ant/src_ant/org/eclipse/m2m/atl/core/ant/tasks/nested/Superimpose.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - Initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.emf/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.core.emf/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.core.emf/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.core.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.core.emf/META-INF/MANIFEST.MF index a42b1407..8bbc5f7d 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.core.emf/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.core.emf;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.m2m.atl.core.emf Require-Bundle: org.eclipse.m2m.atl.common, diff --git a/plugins/org.eclipse.m2m.atl.core.emf/about.html b/plugins/org.eclipse.m2m.atl.core.emf/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/about.html +++ b/plugins/org.eclipse.m2m.atl.core.emf/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.core.emf/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.core.emf/deploy/release/pom.xml index 34a71879..b97baf6f 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.core.emf/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.core.emf</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.core.emf/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.core.emf/deploy/snapshot/pom.xml index 57555f2a..8ddaafab 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.core.emf/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.core.emf</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.core.emf/pom.xml b/plugins/org.eclipse.m2m.atl.core.emf/pom.xml index 00fdbc7b..e9103713 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/pom.xml +++ b/plugins/org.eclipse.m2m.atl.core.emf/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.core.emf</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFExtractor.java b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFExtractor.java index b8efd311..9a2c5b63 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFExtractor.java +++ b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFExtractor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFInjector.java b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFInjector.java index 0861fdd7..a741c2eb 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFInjector.java +++ b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFInjector.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFModel.java b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFModel.java index 5ebbc067..eca1af7f 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFModel.java +++ b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFModel.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFModelFactory.java b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFModelFactory.java index 3dac6b5d..f3562f3e 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFModelFactory.java +++ b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFModelFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFReferenceModel.java b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFReferenceModel.java index 3c58602c..9f8d3f03 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFReferenceModel.java +++ b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/EMFReferenceModel.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/Messages.java b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/Messages.java index 4b8d0ebf..acfd6971 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/Messages.java +++ b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/messages.properties b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/messages.properties index 658a9bc6..33232fed 100644 --- a/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/messages.properties +++ b/plugins/org.eclipse.m2m.atl.core.emf/src/org/eclipse/m2m/atl/core/emf/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.core.ui.vm/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.core.ui.vm/META-INF/MANIFEST.MF index d3c58c85..30de7f7d 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.core.ui.vm;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.m2m.atl.core.ui.vm, diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/about.html b/plugins/org.eclipse.m2m.atl.core.ui.vm/about.html index b6380d4b..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/about.html +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>September 1, 2005</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/pom.xml b/plugins/org.eclipse.m2m.atl.core.ui.vm/pom.xml index 16f533c1..1be90905 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/pom.xml +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.core.ui.vm</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/Messages.java b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/Messages.java index fa426d4d..bb1ce1ce 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/Messages.java +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/RegularVMLauncher.java b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/RegularVMLauncher.java index c6d12f61..46e3eec2 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/RegularVMLauncher.java +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/RegularVMLauncher.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMExtractor.java b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMExtractor.java index f7b394f0..812228af 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMExtractor.java +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMExtractor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMFactory.java b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMFactory.java index cfe4c6e0..ada20f61 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMFactory.java +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMInjector.java b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMInjector.java index 833390a4..a0c6833a 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMInjector.java +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMInjector.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMModelWrapper.java b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMModelWrapper.java index 5f11756e..fe42d28d 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMModelWrapper.java +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/asm/ASMModelWrapper.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/ADWPDebuggee.java b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/ADWPDebuggee.java index 27d5b68c..fa1524aa 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/ADWPDebuggee.java +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/ADWPDebuggee.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/LocalObjectReference.java b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/LocalObjectReference.java index 9b0898ba..6c5aed42 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/LocalObjectReference.java +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/LocalObjectReference.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/NetworkDebugger.java b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/NetworkDebugger.java index ccdf4719..c19fd7a6 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/NetworkDebugger.java +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/debug/NetworkDebugger.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/messages.properties b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/messages.properties index c00f0e43..2c12fd05 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/messages.properties +++ b/plugins/org.eclipse.m2m.atl.core.ui.vm/src/org/eclipse/m2m/atl/core/ui/vm/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.core.ui/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.core.ui/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.core.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.core.ui/META-INF/MANIFEST.MF index 476bb108..706be7f1 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.core.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.core.ui;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.m2m.atl.core.ui, diff --git a/plugins/org.eclipse.m2m.atl.core.ui/about.html b/plugins/org.eclipse.m2m.atl.core.ui/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/about.html +++ b/plugins/org.eclipse.m2m.atl.core.ui/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.core.ui/pom.xml b/plugins/org.eclipse.m2m.atl.core.ui/pom.xml index 71d81eac..c7830314 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/pom.xml +++ b/plugins/org.eclipse.m2m.atl.core.ui/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.core.ui</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLConsole.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLConsole.java index 64d8e1fc..586c872b 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLConsole.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLConsole.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLConsoleTracker.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLConsoleTracker.java index 71703f5d..755edbad 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLConsoleTracker.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLConsoleTracker.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLCoreUIPlugin.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLCoreUIPlugin.java index 763b3ef5..4a52754d 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLCoreUIPlugin.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/ATLCoreUIPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/Messages.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/Messages.java index 4c8ec4c2..03158147 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/Messages.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/ATLLaunchShortcut.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/ATLLaunchShortcut.java index 4aa9f3ec..67fe309c 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/ATLLaunchShortcut.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/ATLLaunchShortcut.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AdvancedTab.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AdvancedTab.java index d1108d29..8ef9ff07 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AdvancedTab.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AdvancedTab.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AtlLaunchConfigurationDelegate.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AtlLaunchConfigurationDelegate.java index 00a37e23..1472b3c4 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AtlLaunchConfigurationDelegate.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AtlLaunchConfigurationDelegate.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AtlTabGroup.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AtlTabGroup.java index 4156a35c..d671c4e7 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AtlTabGroup.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/AtlTabGroup.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/MainAtlTab.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/MainAtlTab.java index bd059f15..2e423287 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/MainAtlTab.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/MainAtlTab.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Mikael Barbero (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlConfigurationDelegate.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlConfigurationDelegate.java index 4ca0e057..811a3096 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlConfigurationDelegate.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlConfigurationDelegate.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlTab.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlTab.java index 9433544d..73499514 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlTab.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlTab.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlTabGroup.java b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlTabGroup.java index 1f3da485..c6a6196f 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlTabGroup.java +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/launch/RemoteAtlTabGroup.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/messages.properties b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/messages.properties index f6035ac2..2f4492ae 100644 --- a/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/messages.properties +++ b/plugins/org.eclipse.m2m.atl.core.ui/src/org/eclipse/m2m/atl/core/ui/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.core/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.core/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.core/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.core/META-INF/MANIFEST.MF index 07da2d38..377ab9a1 100644 --- a/plugins/org.eclipse.m2m.atl.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.core;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.m2m.atl.core, org.eclipse.m2m.atl.core.launch;uses:="org.eclipse.m2m.atl.core", diff --git a/plugins/org.eclipse.m2m.atl.core/about.html b/plugins/org.eclipse.m2m.atl.core/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.core/about.html +++ b/plugins/org.eclipse.m2m.atl.core/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.core/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.core/deploy/release/pom.xml index f4e1d396..d6d9536b 100644 --- a/plugins/org.eclipse.m2m.atl.core/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.core/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.core</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.core/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.core/deploy/snapshot/pom.xml index 197b58b7..638a830d 100644 --- a/plugins/org.eclipse.m2m.atl.core/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.core/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.core</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.core/pom.xml b/plugins/org.eclipse.m2m.atl.core/pom.xml index 68ed3011..759dbefa 100644 --- a/plugins/org.eclipse.m2m.atl.core/pom.xml +++ b/plugins/org.eclipse.m2m.atl.core/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.core</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/ATLCoreException.java b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/ATLCoreException.java index d3661a0a..5fecfd4e 100644 --- a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/ATLCoreException.java +++ b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/ATLCoreException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo diff --git a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IExtractor.java b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IExtractor.java index 0aa5d510..c874dd33 100644 --- a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IExtractor.java +++ b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IExtractor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IInjector.java b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IInjector.java index ae18f3b0..1f02088a 100644 --- a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IInjector.java +++ b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IInjector.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IModel.java b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IModel.java index 18eb5838..2623e3a1 100644 --- a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IModel.java +++ b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IReferenceModel.java b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IReferenceModel.java index 14465d40..30a1e8b2 100644 --- a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IReferenceModel.java +++ b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/IReferenceModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/ModelFactory.java b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/ModelFactory.java index 22207f58..1eab15a9 100644 --- a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/ModelFactory.java +++ b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/ModelFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/launch/ILauncher.java b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/launch/ILauncher.java index 6f3681f2..416a4716 100644 --- a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/launch/ILauncher.java +++ b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/launch/ILauncher.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/service/CoreService.java b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/service/CoreService.java index aad919b4..2695722c 100644 --- a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/service/CoreService.java +++ b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/service/CoreService.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/service/LauncherService.java b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/service/LauncherService.java index 00b8692b..bdd38a7b 100644 --- a/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/service/LauncherService.java +++ b/plugins/org.eclipse.m2m.atl.core/src/org/eclipse/m2m/atl/core/service/LauncherService.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.debug.core/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.debug.core/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.debug.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.debug.core/META-INF/MANIFEST.MF index 6aa9818f..9f748129 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.debug.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.debug.core;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.debug.core;visibility:=reexport, org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.m2m.atl.debug.core/about.html b/plugins/org.eclipse.m2m.atl.debug.core/about.html index b6380d4b..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/about.html +++ b/plugins/org.eclipse.m2m.atl.debug.core/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>September 1, 2005</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.debug.core/pom.xml b/plugins/org.eclipse.m2m.atl.debug.core/pom.xml index a4f8baac..703915d8 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/pom.xml +++ b/plugins/org.eclipse.m2m.atl.debug.core/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.debug.core</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlBreakpoint.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlBreakpoint.java index 39302400..254933e2 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlBreakpoint.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlBreakpoint.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlCoreDebugPlugin.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlCoreDebugPlugin.java index d235bf45..9eadac3c 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlCoreDebugPlugin.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlCoreDebugPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugElement.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugElement.java index dc192de5..5d599ad5 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugElement.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugModelConstants.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugModelConstants.java index bd9cceae..ecea9273 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugModelConstants.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugModelConstants.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugTarget.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugTarget.java index 624d6e1b..db6bb7e3 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugTarget.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlDebugTarget.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlExpression.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlExpression.java index d1dcee2d..80c29a15 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlExpression.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlExpression.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlRunTarget.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlRunTarget.java index a55424a1..b0b4630a 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlRunTarget.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlRunTarget.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlSourceLocator.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlSourceLocator.java index f7adb1db..941d61cb 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlSourceLocator.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlSourceLocator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlStackFrame.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlStackFrame.java index 9ae31f93..b97e2f77 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlStackFrame.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlStackFrame.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlThread.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlThread.java index 583bb60d..df9cff5d 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlThread.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlThread.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlVariable.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlVariable.java index 6f57344f..914cb031 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlVariable.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlVariable.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlWatchExpressionDelegate.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlWatchExpressionDelegate.java index 7829fa5d..3d5a4842 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlWatchExpressionDelegate.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/AtlWatchExpressionDelegate.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/Messages.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/Messages.java index 60b015c0..bfb8d97b 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/Messages.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWP.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWP.java index 7da4568a..04073e88 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWP.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWP.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWPCommand.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWPCommand.java index caedff77..e1dafcc4 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWPCommand.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWPCommand.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWPDebugger.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWPDebugger.java index b0b4ce9b..be156127 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWPDebugger.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ADWPDebugger.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/AtlMapValue.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/AtlMapValue.java index 5bb8cb3a..74e576c1 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/AtlMapValue.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/AtlMapValue.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/AtlValue.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/AtlValue.java index f1426f66..e181f853 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/AtlValue.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/AtlValue.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/BooleanValue.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/BooleanValue.java index 643f7c18..e2db1544 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/BooleanValue.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/BooleanValue.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/IntegerValue.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/IntegerValue.java index 1413d148..ff0878bc 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/IntegerValue.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/IntegerValue.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/NullValue.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/NullValue.java index 7493ef03..e1f9c840 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/NullValue.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/NullValue.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ObjectReference.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ObjectReference.java index 12796079..d3d29989 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ObjectReference.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/ObjectReference.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/RealValue.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/RealValue.java index 94fca4ff..737826d6 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/RealValue.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/RealValue.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/RemoteObjectReference.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/RemoteObjectReference.java index a41e5fd2..af70019b 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/RemoteObjectReference.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/RemoteObjectReference.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/StringValue.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/StringValue.java index ad5e8b4d..9e76e18e 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/StringValue.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/StringValue.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/Value.java b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/Value.java index 1b6ab274..e654fcf6 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/Value.java +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/adwp/Value.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/messages.properties b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/messages.properties index d010a40b..6727acc0 100644 --- a/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/messages.properties +++ b/plugins/org.eclipse.m2m.atl.debug.core/src/org/eclipse/m2m/atl/debug/core/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/META-INF/MANIFEST.MF index 02a3b86d..84744cf8 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.drivers.emf4atl;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.m2m.atl.drivers.emf4atl, diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/about.html b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/about.html index b6380d4b..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/about.html +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>September 1, 2005</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/deploy/release/pom.xml index 563e20bd..836eb4ee 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.drivers.emf4atl</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/deploy/snapshot/pom.xml index 7cb451bc..2dab50f2 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.drivers.emf4atl</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/pom.xml b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/pom.xml index a586fde6..0910b5c1 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/pom.xml +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.drivers.emf4atl</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/ASMEMFModel.java b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/ASMEMFModel.java index 88dc4351..21946e1b 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/ASMEMFModel.java +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/ASMEMFModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/ASMEMFModelElement.java b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/ASMEMFModelElement.java index bd3dcc8b..8c8a9117 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/ASMEMFModelElement.java +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/ASMEMFModelElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/AtlEMFModelHandler.java b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/AtlEMFModelHandler.java index de894857..54cb11cd 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/AtlEMFModelHandler.java +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/AtlEMFModelHandler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/EMFModelLoader.java b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/EMFModelLoader.java index f2dc83af..33be5931 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/EMFModelLoader.java +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/EMFModelLoader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/package.html b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/package.html index 5dbf0c7d..0f39a8db 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/package.html +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/package.html @@ -6,9 +6,9 @@ /****************************************************************************** * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - documentation diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/extractor/ASMModelAdapter.java b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/extractor/ASMModelAdapter.java index 085ca603..777af0cc 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/extractor/ASMModelAdapter.java +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/extractor/ASMModelAdapter.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/extractor/TCSExtractor.java b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/extractor/TCSExtractor.java index f2e06ef9..076d4c0e 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/extractor/TCSExtractor.java +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/extractor/TCSExtractor.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2005, 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/injector/ASMModelAdapter.java b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/injector/ASMModelAdapter.java index 14f1c12a..0e25a718 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/injector/ASMModelAdapter.java +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/injector/ASMModelAdapter.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2004, 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/injector/TCSInjector.java b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/injector/TCSInjector.java index 82910510..035aa5bf 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/injector/TCSInjector.java +++ b/plugins/org.eclipse.m2m.atl.drivers.emf4atl/src/org/eclipse/m2m/atl/drivers/emf4atl/tcs/injector/TCSInjector.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2004, 2008, 2014 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/about.html b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/about.html index 2b9bcfbe..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/about.html +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>May 30, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/epl-v10.html b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/epl-v10.html deleted file mode 100644 index cb1073a4..00000000 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/epl-v10.html +++ /dev/null @@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<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=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - 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; - } -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; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@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></p> - -</div> - -</body> - -</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/feature.properties b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/feature.properties index 832a7f7b..0fe8e69d 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/feature.properties +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002, 2009 ATLAS Group (INRIA & LINA). # * All rights reserved. This program and the accompanying materials -# * are made available under the terms of the Eclipse Public License v1.0 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * ATLAS Group (INRIA & LINA) @@ -70,8 +70,8 @@ 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\ +the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at https://www.eclipse.org/legal/epl-2.0/.\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\ diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/feature.xml b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/feature.xml index 3b08a6e7..b52a2fba 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/feature.xml +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/feature.xml @@ -9,13 +9,13 @@ MDR4ATL Driver Feature </description> - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> + <copyright url="https://www.eclipse.org/legal/epl-2.0/"> /* * Copyright (c) 2004, 2009 ATLAS Group (INRIA and LINA). * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * */ </copyright> diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/license.html b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/license.html index f3f87850..7269852e 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/license.html +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/license.html @@ -28,9 +28,9 @@ OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> <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 +Eclipse Public License Version 2.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>. + available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>Content includes, but is not limited to, source code, object code, diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/epl-v10.html b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/epl-v10.html deleted file mode 100644 index cb1073a4..00000000 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/epl-v10.html +++ /dev/null @@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<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=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - 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; - } -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; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@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></p> - -</div> - -</body> - -</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/epl-v20.html b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/notice.html b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/notice.html index f3f87850..7269852e 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/notice.html +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl-feature/rootfiles/notice.html @@ -28,9 +28,9 @@ OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> <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 +Eclipse Public License Version 2.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>. + available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>Content includes, but is not limited to, source code, object code, diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/about.html b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/about.html index b6380d4b..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/about.html +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>September 1, 2005</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/pom.xml b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/pom.xml index 2c490608..b7ac0f60 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/pom.xml +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/ASMMDRModel.java b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/ASMMDRModel.java index 3e19c588..aef86258 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/ASMMDRModel.java +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/ASMMDRModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/ASMMDRModelElement.java b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/ASMMDRModelElement.java index b0503458..892a8671 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/ASMMDRModelElement.java +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/ASMMDRModelElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/AtlMDRModelHandler.java b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/AtlMDRModelHandler.java index 72c750b3..09cebbfc 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/AtlMDRModelHandler.java +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/AtlMDRModelHandler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/MDRModelLoader.java b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/MDRModelLoader.java index b6542034..4d1d7e7e 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/MDRModelLoader.java +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/eclipse/m2m/atl/drivers/mdr4atl/MDRModelLoader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/openide/util/lookup/ATLLookup.java b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/openide/util/lookup/ATLLookup.java index 2810797d..e7cf64b1 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/openide/util/lookup/ATLLookup.java +++ b/plugins/org.eclipse.m2m.atl.drivers.mdr4atl/src/org/openide/util/lookup/ATLLookup.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/about.html b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/about.html index f88b9c97..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/about.html +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 22, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/build.properties b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/build.properties index 83fb0694..7c1e803f 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/build.properties +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/build.properties @@ -1,11 +1,11 @@ bin.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ license.html,\ license.txt src.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ license.html diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/epl-v10.html b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/epl-v10.html deleted file mode 100644 index cb1073a4..00000000 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/epl-v10.html +++ /dev/null @@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<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=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - 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; - } -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; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@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></p> - -</div> - -</body> - -</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/feature.properties b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/feature.properties index dc45f5c0..4b2fdd2a 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/feature.properties +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002-2007 ATLAS Group (INRIA & LINA). # * All rights reserved. This program and the accompanying materials -# * are made available under the terms of the Eclipse Public License v1.0 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * ATLAS Group (INRIA & LINA) @@ -37,143 +37,167 @@ providerName=Eclipse.org # "description" property - description of the feature description=Driver UML for ATL -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html +# "updateSiteName" property - label for the update site +ModelingUpdateSiteName=Eclipse Modeling # ============================================================================== # %%% END OF TRANSLATED PROPERTIES %%% # The above properties have been shipped for translation. # ============================================================================== +copyrightURL = copyright.txt +copyright = Copyright (c) 2004, 2009 INRIA. \n\ +All rights reserved. This program and the accompanying materials \n\ +are made available under the terms of the Eclipse Public License v2.0 \n\ +which accompanies this distribution, and is available at \n\ +https://www.eclipse.org/legal/epl-2.0/ \n\ + \n\ + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +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\ -February 1, 2011\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - 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\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - 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\ - - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - 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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ - the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ - extending or updating the functionality of an Eclipse-based product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ - Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ - govern the use of the Installable Software ("Installable Software Agreement") and such\n\ - Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ - with the Specification. Such Installable Software Agreement must inform the user of the\n\ - terms and conditions that govern the Installable Software and must solicit acceptance by\n\ - the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation\n\ - of the Installable Software.\n\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## - - -# "updateSiteName" property - label for the update site -updateSiteName=ATL Updates
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/feature.xml b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/feature.xml index bb63bd6c..3075c57f 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/feature.xml +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/feature.xml @@ -9,226 +9,18 @@ UML24ATL Driver Feature </description> - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - /* - * Copyright (c) 2007, ATLAS Group (INRIA and LINA). - * 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 - * - */ + <copyright url="%copyrightURL"> + %copyright </copyright> - <license url="http://www.eclipse.org/legal/epl-v10.html"> - Eclipse Public License - v 1.0 -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. -1. DEFINITIONS -"Contribution" means: -a) in the case of the initial Contributor, the initial code and -documentation distributed under this Agreement, and -b) in the case of each subsequent Contributor: -i) changes to the Program, and -ii) additions to the Program; -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. -"Contributor" means any person or entity that distributes the -Program. -"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. -"Program" means the Contributions distributed in accordance with -this Agreement. -"Recipient" means anyone who receives the Program under this -Agreement, including all Contributors. -2. GRANT OF RIGHTS -a) Subject to the terms of this Agreement, each Contributor hereby -grants Recipient a non-exclusive, worldwide, royalty-free copyright -license to 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. -b) Subject to the terms of this Agreement, each Contributor hereby -grants Recipient a non-exclusive, worldwide, 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. -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. -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. -3. REQUIREMENTS -A Contributor may choose to distribute the Program in object -code form under its own license agreement, provided that: -a) it complies with the terms and conditions of this Agreement; -and -b) its license agreement: -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; -ii) effectively excludes on behalf of all Contributors all liability -for damages, including direct, indirect, special, incidental -and consequential damages, such as lost profits; -iii) states that any provisions which differ from this Agreement -are offered by that Contributor alone and not by any other party; -and -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. -When the Program is made available in source code form: -a) it must be made available under this Agreement; and -b) a copy of this Agreement must be included with each copy of -the Program. -Contributors may not remove or alter any copyright notices contained -within the Program. -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. -4. COMMERCIAL DISTRIBUTION -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. -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. -5. NO WARRANTY -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. -6. DISCLAIMER OF LIABILITY -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. -7. GENERAL -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. -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. -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. -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. -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. + <license url="%licenseURL"> + %license </license> - <url> - <update label="ATL Updates" url="http://download.eclipse.org/modeling/m2m/updates/"/> - </url> - - <requires> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.m2m.atl.engine"/> - <import plugin="org.eclipse.emf.ecore.xmi"/> - </requires> +<url> + <update label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> +</url> <plugin id="org.eclipse.m2m.atl.drivers.uml24atl" diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/license.html b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/license.html index f19c483b..c35d8345 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/license.html +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/license.html @@ -21,8 +21,8 @@ <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>. +<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 2.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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 diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/epl-v10.html b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/epl-v10.html deleted file mode 100644 index cb1073a4..00000000 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/epl-v10.html +++ /dev/null @@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<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=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - 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; - } -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; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@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></p> - -</div> - -</body> - -</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/epl-v20.html b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/notice.html b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/notice.html index 74122b24..6dde95fa 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/notice.html +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl-feature/rootfiles/notice.html @@ -20,8 +20,8 @@ <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>. +<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 2.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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.org CVS repository ("Repository") in CVS diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/META-INF/MANIFEST.MF index 54730655..2372a379 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.drivers.uml24atl;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.m2m.atl.drivers.uml24atl diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/about.html b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/about.html index f88b9c97..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/about.html +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 22, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/deploy/release/pom.xml index 6af45ddb..290865db 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.drivers.uml24atl</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/deploy/snapshot/pom.xml index fdb78b07..39d99b83 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.drivers.uml24atl</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/pom.xml b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/pom.xml index 9662aad3..c467b20c 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/pom.xml +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.drivers.uml24atl</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/ASMUMLModel.java b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/ASMUMLModel.java index 0f8d9251..240cca60 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/ASMUMLModel.java +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/ASMUMLModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and C-S. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/ASMUMLModelElement.java b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/ASMUMLModelElement.java index 10c89cc4..075be82c 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/ASMUMLModelElement.java +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/ASMUMLModelElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and C-S. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/AtlUML2ModelHandler.java b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/AtlUML2ModelHandler.java index 6c621502..823e5acc 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/AtlUML2ModelHandler.java +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/AtlUML2ModelHandler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and C-S. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/Invocation.java b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/Invocation.java index 7a058c3e..b2882b6f 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/Invocation.java +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/Invocation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and C-S. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/UMLModelLoader.java b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/UMLModelLoader.java index 8ba84a72..5c2d42e4 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/UMLModelLoader.java +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/UMLModelLoader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar (Vrije Universiteit Brussel) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/package.html b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/package.html index 866df2af..a94a8d18 100644 --- a/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/package.html +++ b/plugins/org.eclipse.m2m.atl.drivers.uml24atl/src/org/eclipse/m2m/atl/drivers/uml24atl/package.html @@ -6,9 +6,9 @@ /****************************************************************************** * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - documentation diff --git a/plugins/org.eclipse.m2m.atl.dsls/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.dsls/META-INF/MANIFEST.MF index a2affc15..b3c807c3 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.dsls/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.dsls;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-ClassPath: . Export-Package: org.eclipse.m2m.atl.dsls, @@ -14,7 +14,7 @@ Export-Package: org.eclipse.m2m.atl.dsls, org.eclipse.m2m.atl.dsls.textsource Require-Bundle: org.eclipse.core.resources, org.eclipse.core.runtime, - org.antlr.runtime;bundle-version="[3.0.0,3.1.0)", + org.antlr.runtime;bundle-version="[3.2.0,3.3.0)", org.eclipse.m2m.atl.common, org.eclipse.m2m.atl.core.emf, org.eclipse.m2m.atl.emftvm diff --git a/plugins/org.eclipse.m2m.atl.dsls/about.html b/plugins/org.eclipse.m2m.atl.dsls/about.html index 9d9e5a6e..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/about.html +++ b/plugins/org.eclipse.m2m.atl.dsls/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 5, 2004</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.dsls/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.dsls/deploy/release/pom.xml index 75d45f97..bb16d816 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.dsls/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.dsls</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> @@ -38,7 +38,7 @@ <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> - <version>[3.0,3.1)</version> + <version>[3.2,3.3)</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.dsls/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.dsls/deploy/snapshot/pom.xml index a6d87b70..0525197c 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.dsls/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.dsls</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> @@ -38,7 +38,7 @@ <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> - <version>[3.0,3.1)</version> + <version>[3.2,3.3)</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.dsls/pom.xml b/plugins/org.eclipse.m2m.atl.dsls/pom.xml index ff4dbb6f..60c144e0 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/pom.xml +++ b/plugins/org.eclipse.m2m.atl.dsls/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.dsls</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Activator.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Activator.java index 774544a1..aee1141e 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Activator.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Activator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault & Mikael Barbero (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/DSLResourceProvider.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/DSLResourceProvider.java index e154bba5..68320963 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/DSLResourceProvider.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/DSLResourceProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault & Mikael Barbero (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Messages.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Messages.java index fceabb28..d11555bf 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Messages.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Resource.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Resource.java index cd8674f9..d35ccd0f 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Resource.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/Resource.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/core/EMFTCSExtractor.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/core/EMFTCSExtractor.java index ef138ace..a80b5fcf 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/core/EMFTCSExtractor.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/core/EMFTCSExtractor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/core/EMFTCSInjector.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/core/EMFTCSInjector.java index 3d1269f6..a532c526 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/core/EMFTCSInjector.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/core/EMFTCSInjector.java @@ -1,10 +1,11 @@ /******************************************************************************* * Copyright (c) 2009, 2012, 2014 Obeo. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * Obeo - initial API and implementation * Dennis Wagelaar @@ -32,21 +33,18 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EcoreFactoryImpl; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.impl.ResourceImpl; import org.eclipse.m2m.atl.common.ATLLogger; import org.eclipse.m2m.atl.core.IModel; import org.eclipse.m2m.atl.core.emf.EMFModel; import org.eclipse.m2m.atl.dsls.tcs.injector.ModelAdapter; import org.eclipse.m2m.atl.dsls.tcs.injector.ParserLauncher; import org.eclipse.m2m.atl.emftvm.EmftvmFactory; -import org.eclipse.m2m.atl.emftvm.EmftvmPackage; import org.eclipse.m2m.atl.emftvm.Metamodel; import org.eclipse.m2m.atl.emftvm.Model; /** * A wrapper which allow to create {@link IModel} from text with TCS. - * + * * @author <a href="mailto:william.piers@obeo.fr">William Piers</a> * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> */ @@ -87,20 +85,20 @@ public class EMFTCSInjector { super(); } - public Object inject(EMFModel target, InputStream source, Map params) throws IOException { + public Object inject(final EMFModel target, final InputStream source, final Map params) throws IOException { return inject(target, new InputStreamReader(source), params); } - public Object inject(EMFModel target, Reader source, Map params) throws IOException { - ModelAdapter targetModelAdapter = new EMFInjectorAdapter(target); + public Object inject(final EMFModel target, final Reader source, final Map params) throws IOException { + final ModelAdapter targetModelAdapter = new EMFInjectorAdapter(target); - EMFModel problems = (EMFModel)params.get("problems"); + final EMFModel problems = (EMFModel)params.get("problems"); if (problems != null) { - ModelAdapter problemsModelAdapter = new EMFInjectorAdapter(problems); + final ModelAdapter problemsModelAdapter = new EMFInjectorAdapter(problems); params.put("problems", problemsModelAdapter); } - EObject root = (EObject)new ParserLauncher().parse(targetModelAdapter, source, params); + final EObject root = (EObject)new ParserLauncher().parse(targetModelAdapter, source, params); target.commitToResource(); if(problems != null) problems.commitToResource(); @@ -117,29 +115,28 @@ public class EMFTCSInjector { private final Model model; private final Metamodel metamodel; - public EMFInjectorAdapter(Object model) { + public EMFInjectorAdapter(final Object model) { this.emfModel = (EMFModel)model; - this.model = EmftvmFactory.eINSTANCE.createModel(); if (emfModel.getResource() == null) { // Trigger resource creation - Object element = emfModel.newElement(EcorePackage.eINSTANCE.getEClass()); + final Object element = emfModel.newElement(EcorePackage.eINSTANCE.getEClass()); emfModel.getResource().getContents().remove(element); } - this.model.setResource(emfModel.getResource()); - this.metamodel = EmftvmFactory.eINSTANCE.createMetamodel(); - this.metamodel.setResource(emfModel.getReferenceModel().getResource()); + this.model = EmftvmFactory.eINSTANCE.createModel(emfModel.getResource()); + this.metamodel = EmftvmFactory.eINSTANCE + .createMetamodel(emfModel.getReferenceModel().getResource()); } public Object getModel() { return this.emfModel; } - public Object get(Object modelElement, String name) { + public Object get(final Object modelElement, final String name) { if (modelElement == null) { return null; } else { - EObject eo = (EObject)modelElement; - EStructuralFeature sf = eo.eClass().getEStructuralFeature(name); + final EObject eo = (EObject)modelElement; + final EStructuralFeature sf = eo.eClass().getEStructuralFeature(name); if (sf == null) { return null; } @@ -147,15 +144,15 @@ public class EMFTCSInjector { } } - public Object createElement(String typeName) { + public Object createElement(final String typeName) { return model.newElement(getTypeByName(typeName)); } - public Set getElementsByType(String typeName) { + public Set getElementsByType(final String typeName) { return model.allInstancesOf(getTypeByName(typeName)).asSet(); } - public void set(Object modelElement, String name, Object value) { + public void set(final Object modelElement, final String name, Object value) { if (value == null) { return; } @@ -170,23 +167,23 @@ public class EMFTCSInjector { // makes it possible to use an integer to set a floating point property if (value instanceof Integer) { - String targetType = feature.getEType().getInstanceClassName(); + final String targetType = feature.getEType().getInstanceClassName(); if ("java.lang.Double".equals(targetType) || "java.lang.Float".equals(targetType)) { //$NON-NLS-1$ //$NON-NLS-2$ value = new Double(((Integer)value).doubleValue()); } } - EClassifier type = feature.getEType(); - boolean targetIsEnum = type instanceof EEnum; + final EClassifier type = feature.getEType(); + final boolean targetIsEnum = type instanceof EEnum; - Object oldValue = eo.eGet(feature); + final Object oldValue = eo.eGet(feature); if (oldValue instanceof Collection) { - Collection oldCol = (Collection)oldValue; + final Collection oldCol = (Collection)oldValue; if (value instanceof Collection) { if (targetIsEnum) { - EEnum eenum = (EEnum)type; - for (Iterator i = ((Collection)value).iterator(); i.hasNext();) { - Object v = i.next(); + final EEnum eenum = (EEnum)type; + for (final Iterator i = ((Collection)value).iterator(); i.hasNext();) { + final Object v = i.next(); oldCol.add(eenum.getEEnumLiteralByLiteral(v.toString()).getInstance()); } } else { @@ -194,7 +191,7 @@ public class EMFTCSInjector { } } else { if (targetIsEnum) { - EEnum eenum = (EEnum)type; + final EEnum eenum = (EEnum)type; oldCol.add(eenum.getEEnumLiteralByLiteral(value.toString()).getInstance()); } else { oldCol.add(value); @@ -202,7 +199,7 @@ public class EMFTCSInjector { } } else { if (value instanceof Collection) { - Collection c = (Collection)value; + final Collection c = (Collection)value; if (!c.isEmpty()) { value = c.iterator().next(); } else { @@ -210,9 +207,9 @@ public class EMFTCSInjector { } } if (targetIsEnum) { - EEnum eenum = (EEnum)type; + final EEnum eenum = (EEnum)type; if (value != null) { - EEnumLiteral literal = eenum.getEEnumLiteral(value.toString()); + final EEnumLiteral literal = eenum.getEEnumLiteral(value.toString()); if (literal != null) { eo.eSet(feature, literal.getInstance()); } else { @@ -225,11 +222,11 @@ public class EMFTCSInjector { } } - public boolean isCandidate(Object ame, String typeName) { + public boolean isCandidate(final Object ame, final String typeName) { boolean ret = false; - Object valueType = getTypeByName(typeName); + final Object valueType = getTypeByName(typeName); - Object type = getType(ame); + final Object type = getType(ame); if (valueType instanceof EObject) { final EObject o = (EObject)valueType; @@ -238,7 +235,7 @@ public class EMFTCSInjector { if ((o instanceof EClass) && (t instanceof EClass)) { try { ret = o.equals(t) || ((EClass)o).isSuperTypeOf((EClass)t); - } catch (Exception e) { + } catch (final Exception e) { ATLLogger.log(Level.SEVERE, e.getLocalizedMessage(), e); } } @@ -246,7 +243,7 @@ public class EMFTCSInjector { return ret; } - public Object getType(Object value) { + public Object getType(final Object value) { if (value instanceof EObject) { return ((EObject)value).eClass(); } else if (value instanceof EList) { @@ -256,21 +253,21 @@ public class EMFTCSInjector { } } - public boolean isAModelElement(Object me) { + public boolean isAModelElement(final Object me) { return me instanceof EObject; } - public String getString(Object ame, String propName) { + public String getString(final Object ame, final String propName) { return get(ame, propName).toString(); } - public Object createEnumLiteral(String name) { - EEnumLiteral ret = EcoreFactoryImpl.eINSTANCE.createEEnumLiteral(); + public Object createEnumLiteral(final String name) { + final EEnumLiteral ret = EcoreFactoryImpl.eINSTANCE.createEEnumLiteral(); ret.setName(name); return ret; } - private EClass getTypeByName(String typeName) { + private EClass getTypeByName(final String typeName) { final EClassifier type = metamodel.findType(typeName); return type instanceof EClass ? (EClass)type : null; } diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/messages.properties b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/messages.properties index 114e9d50..e6b92c00 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/messages.properties +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/ModelAdapter.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/ModelAdapter.java index 21ad54d6..64aede8e 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/ModelAdapter.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/ModelAdapter.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/PrettyPrinter.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/PrettyPrinter.java index 42863119..4edac8a4 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/PrettyPrinter.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/PrettyPrinter.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation @@ -682,7 +682,7 @@ if(debugws) out.debug("</block>"); ret.append("\\b"); } else if(c == '\f') { ret.append("\\f"); - } else if((c < ' ') || ((c > '~') && (c < '¡'))) { + } else if((c < ' ') || ((c > '~') && (c < '¡'))) { ret.append("\\"); if(c < 010) ret.append("0"); diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractionException.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractionException.java index ac3a85ea..57858006 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractionException.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractionException.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractorPrintStream.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractorPrintStream.java index 035b9059..555b3e0b 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractorPrintStream.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractorPrintStream.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractorStream.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractorStream.java index 89725ba0..8abf3c12 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractorStream.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/extractor/TCSExtractorStream.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3.tokens b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3.tokens index ebfd7b60..292f88c1 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3.tokens +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3.tokens @@ -1,99 +1,166 @@ -GE=27 -LT=26 -STAR=22 -LSQUARE=16 -SHARP=38 -POINT=19 -ESC=35 -RARROW=20 -LARROW=40 -LCURLY=7 -EXCL=37 -FLOAT=36 -INT=6 +T__50=50 +QMARK=39 MINUS=21 RSQUARE=17 +T__59=59 +T__55=55 +T__56=56 +T__57=57 +T__58=58 +T__51=51 +T__52=52 +T__53=53 +T__54=54 COMA=11 -SEMI=14 -ALPHA=33 +T__60=60 +T__61=61 LPAREN=10 -COLON=18 +T__66=66 +T__67=67 +T__68=68 +T__69=69 +T__62=62 +T__63=63 +T__64=64 +T__65=65 +SEMI=14 COLONCOLON=9 +COMMENT=41 +ESC=35 +RCURLY=8 +LCURLY=7 +RARROW=20 +T__48=48 +STAR=22 +T__49=49 +LARROW=40 +T__44=44 +T__45=45 +STRING=5 +LE=28 +SHARP=38 +T__46=46 +T__47=47 +EXCL=37 +T__42=42 +T__43=43 +T__91=91 +T__100=100 +T__92=92 +T__93=93 +T__102=102 +T__94=94 +T__101=101 +T__90=90 +LT=26 +ALPHA=33 +PIPE=15 +T__99=99 +T__95=95 +T__96=96 +T__97=97 +T__98=98 RPAREN=12 +EQ=13 NAME=4 +NE=29 +NL=30 +PLUS=24 +T__70=70 +T__71=71 +FLOAT=36 +T__72=72 +INT=6 +T__77=77 +T__78=78 +T__79=79 +T__73=73 WS=31 +T__74=74 +T__75=75 +GE=27 +T__76=76 +T__80=80 +T__81=81 +T__82=82 +T__83=83 SLASH=23 SNAME=34 -RCURLY=8 +COLON=18 GT=25 -PLUS=24 -PIPE=15 DIGIT=32 -NL=30 -EQ=13 -COMMENT=41 -QMARK=39 -LE=28 -STRING=5 -NE=29 -'named'=53 -'code'=48 -'swap'=70 -'Sequence'=92 -'iterate'=71 -'then'=89 +LSQUARE=16 +T__88=88 +T__89=89 +T__84=84 +T__104=104 +POINT=19 +T__85=85 +T__103=103 +T__86=86 +T__87=87 +T__105=105 +'getasm'=75 +'not'=98 +'and'=102 +'self'=90 +'pushi'=80 +'in'=51 +'else'=57 +'load'=82 +'div'=99 +'or'=103 +'xor'=104 +'operation'=54 'startsWith'=43 -'enditerate'=72 -'field'=64 +'pushd'=81 +'param'=65 +'variable'=52 +'last'=91 +'code'=48 +'named'=53 +'store'=83 +'OclUndefined'=94 'warning'=63 -'pushi'=78 -'pop'=69 +'if'=56 +'goto'=89 +'swap'=72 +'true'=96 +'acg'=42 +'then'=92 'function'=44 -'error'=62 -'true'=93 -'else'=57 +'pop'=71 'let'=58 -'and'=99 -'dup'=67 -'set'=85 -'getasm'=73 -'if'=56 -'not'=95 -'in'=51 -'get'=84 -'critic'=61 -'last'=88 -'context'=55 +'supercall'=86 +'field'=64 +'enditerate'=74 +'pcall'=85 +'mod'=100 +'pushf'=78 +'findme'=76 'mode'=49 -'foreach'=50 -'new'=66 -'mod'=97 -'store'=81 -'load'=80 -'call'=82 -'OclUndefined'=91 -'pushf'=76 -'div'=96 -'goto'=86 'analyze'=59 -'report'=60 -'isa'=98 -'findme'=74 -'xor'=101 -'variable'=52 -'operation'=54 -'pusht'=75 -'dup_x1'=68 -'supercall'=83 -'acg'=42 +'Sequence'=95 'asm'=46 -'false'=94 -'or'=100 -'param'=65 +'report'=60 +'false'=97 +'isa'=101 +'context'=55 +'newin'=67 +'implies'=105 +'push'=79 +'pusht'=77 +'delete'=68 +'get'=87 +'error'=62 +'call'=84 +'critic'=61 'attribute'=45 -'push'=77 -'implies'=102 +'new'=66 +'set'=88 +'foreach'=50 +'dup'=69 +'dup_x1'=70 +'iterate'=73 'name'=47 -'pushd'=79 -'self'=87 -'endif'=90 +'endif'=93 diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3Lexer.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3Lexer.java index 421bbfe6..c49e50b4 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3Lexer.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3Lexer.java @@ -1,15 +1,4 @@ -/** - * Copyright (c) 2008 INRIA. - * 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: - * INRIA - initial API and implementation - * - */ -// $ANTLR 3.0.1 D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g 2009-03-04 15:46:32 +// $ANTLR 3.2 Sep 23, 2009 12:02:23 ACG_ANTLR3.g 2019-12-05 18:11:16 package org.eclipse.m2m.atl.dsls.tcs.injector; import org.antlr.runtime.*; @@ -18,1305 +7,1501 @@ import java.util.List; import java.util.ArrayList; public class ACG_ANTLR3Lexer extends Lexer { - public static final int LT=26; + public static final int T__50=50; + public static final int QMARK=39; + public static final int MINUS=21; + public static final int RSQUARE=17; + public static final int T__59=59; + public static final int T__55=55; + public static final int T__56=56; + public static final int T__57=57; + public static final int T__58=58; + public static final int T__51=51; + public static final int T__52=52; + public static final int T__53=53; + public static final int T__54=54; + public static final int COMA=11; + public static final int T__60=60; + public static final int T__61=61; + public static final int LPAREN=10; + public static final int T__66=66; + public static final int T__67=67; + public static final int T__68=68; + public static final int T__69=69; + public static final int T__62=62; + public static final int T__63=63; + public static final int T__64=64; + public static final int T__65=65; + public static final int SEMI=14; + public static final int COLONCOLON=9; + public static final int COMMENT=41; + public static final int ESC=35; + public static final int RCURLY=8; + public static final int LCURLY=7; + public static final int RARROW=20; + public static final int T__48=48; public static final int STAR=22; - public static final int LSQUARE=16; + public static final int T__49=49; + public static final int LARROW=40; + public static final int T__44=44; + public static final int T__45=45; + public static final int STRING=5; + public static final int LE=28; + public static final int SHARP=38; + public static final int T__46=46; + public static final int T__47=47; public static final int EXCL=37; - public static final int EOF=-1; + public static final int T__42=42; + public static final int T__43=43; + public static final int T__91=91; + public static final int T__100=100; + public static final int T__92=92; + public static final int T__93=93; + public static final int T__102=102; + public static final int T__94=94; + public static final int T__101=101; + public static final int T__90=90; + public static final int LT=26; + public static final int ALPHA=33; + public static final int PIPE=15; + public static final int T__99=99; + public static final int T__95=95; + public static final int T__96=96; + public static final int T__97=97; + public static final int T__98=98; public static final int RPAREN=12; - public static final int NAME=4; - public static final int NL=30; public static final int EQ=13; - public static final int COMMENT=41; + public static final int NAME=4; public static final int NE=29; - public static final int GE=27; - public static final int SHARP=38; - public static final int T49=49; - public static final int LCURLY=7; - public static final int T48=48; + public static final int NL=30; + public static final int PLUS=24; + public static final int T__70=70; + public static final int T__71=71; + public static final int FLOAT=36; + public static final int T__72=72; public static final int INT=6; - public static final int T100=100; - public static final int T43=43; - public static final int T42=42; - public static final int T102=102; - public static final int T101=101; - public static final int T47=47; - public static final int ALPHA=33; - public static final int T46=46; - public static final int T45=45; - public static final int T44=44; - public static final int COLONCOLON=9; + public static final int T__77=77; + public static final int T__78=78; + public static final int T__79=79; + public static final int T__73=73; public static final int WS=31; + public static final int EOF=-1; + public static final int T__74=74; + public static final int T__75=75; + public static final int GE=27; + public static final int T__76=76; + public static final int T__80=80; + public static final int T__81=81; + public static final int T__82=82; + public static final int T__83=83; + public static final int SLASH=23; public static final int SNAME=34; - public static final int T50=50; - public static final int T59=59; + public static final int COLON=18; public static final int GT=25; - public static final int T52=52; - public static final int T51=51; - public static final int T54=54; - public static final int QMARK=39; - public static final int T53=53; - public static final int T56=56; - public static final int T55=55; - public static final int T58=58; - public static final int T57=57; - public static final int T75=75; - public static final int T76=76; - public static final int T73=73; - public static final int T74=74; - public static final int T79=79; - public static final int T77=77; - public static final int T78=78; - public static final int POINT=19; - public static final int ESC=35; - public static final int LARROW=40; - public static final int FLOAT=36; - public static final int T72=72; - public static final int LPAREN=10; - public static final int T71=71; - public static final int T70=70; - public static final int T62=62; - public static final int T63=63; - public static final int T64=64; - public static final int T65=65; - public static final int SLASH=23; - public static final int T66=66; - public static final int T67=67; - public static final int T68=68; - public static final int T69=69; - public static final int PIPE=15; - public static final int PLUS=24; public static final int DIGIT=32; - public static final int T61=61; - public static final int T60=60; - public static final int T99=99; - public static final int T97=97; - public static final int T98=98; - public static final int T95=95; - public static final int T96=96; - public static final int RARROW=20; - public static final int MINUS=21; - public static final int RSQUARE=17; - public static final int T94=94; - public static final int Tokens=103; - public static final int T93=93; - public static final int COMA=11; - public static final int T92=92; - public static final int SEMI=14; - public static final int T91=91; - public static final int T90=90; - public static final int COLON=18; - public static final int T88=88; - public static final int T89=89; - public static final int T84=84; - public static final int T85=85; - public static final int T86=86; - public static final int T87=87; - public static final int RCURLY=8; - public static final int T81=81; - public static final int T80=80; - public static final int T83=83; - public static final int T82=82; - public static final int LE=28; - public static final int STRING=5; - - + public static final int LSQUARE=16; + public static final int T__88=88; + public static final int T__89=89; + public static final int T__84=84; + public static final int T__104=104; + public static final int POINT=19; + public static final int T__85=85; + public static final int T__103=103; + public static final int T__86=86; + public static final int T__87=87; + public static final int T__105=105; + + private void newline() {} - + public org.eclipse.m2m.atl.dsls.tcs.injector.TCSRuntime ei = null; - + public void displayRecognitionError(String[] tokenNames, RecognitionException e) { ei.reportError((Exception)e); } - + public Token emit() { org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken ret = null; - - ret = new org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken(input, type, channel, tokenStartCharIndex, getCharIndex()-1); - ret.setLine(tokenStartLine); - ret.setText(text); - ret.setCharPositionInLine(tokenStartCharPositionInLine); + + ret = new org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken(input, state.type, state.channel, state.tokenStartCharIndex, getCharIndex()-1); + ret.setLine(state.tokenStartLine); + ret.setText(state.text); + ret.setCharPositionInLine(state.tokenStartCharPositionInLine); ret.setEndLine(getLine()); ret.setEndColumn(getCharPositionInLine()); emit(ret); - + return ret; } - + + + + // delegates + // delegators public ACG_ANTLR3Lexer() {;} public ACG_ANTLR3Lexer(CharStream input) { - super(input); + this(input, new RecognizerSharedState()); + } + public ACG_ANTLR3Lexer(CharStream input, RecognizerSharedState state) { + super(input,state); + } - public String getGrammarFileName() { return "D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g"; } + public String getGrammarFileName() { return "ACG_ANTLR3.g"; } - // $ANTLR start T42 - public final void mT42() throws RecognitionException { + // $ANTLR start "T__42" + public final void mT__42() throws RecognitionException { try { - int _type = T42; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:29:5: ( 'acg' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:29:7: 'acg' + int _type = T__42; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:30:7: ( 'acg' ) + // ACG_ANTLR3.g:30:9: 'acg' { match("acg"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T42 + // $ANTLR end "T__42" - // $ANTLR start T43 - public final void mT43() throws RecognitionException { + // $ANTLR start "T__43" + public final void mT__43() throws RecognitionException { try { - int _type = T43; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:30:5: ( 'startsWith' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:30:7: 'startsWith' + int _type = T__43; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:31:7: ( 'startsWith' ) + // ACG_ANTLR3.g:31:9: 'startsWith' { match("startsWith"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T43 + // $ANTLR end "T__43" - // $ANTLR start T44 - public final void mT44() throws RecognitionException { + // $ANTLR start "T__44" + public final void mT__44() throws RecognitionException { try { - int _type = T44; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:31:5: ( 'function' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:31:7: 'function' + int _type = T__44; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:32:7: ( 'function' ) + // ACG_ANTLR3.g:32:9: 'function' { match("function"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T44 + // $ANTLR end "T__44" - // $ANTLR start T45 - public final void mT45() throws RecognitionException { + // $ANTLR start "T__45" + public final void mT__45() throws RecognitionException { try { - int _type = T45; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:32:5: ( 'attribute' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:32:7: 'attribute' + int _type = T__45; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:33:7: ( 'attribute' ) + // ACG_ANTLR3.g:33:9: 'attribute' { match("attribute"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T45 + // $ANTLR end "T__45" - // $ANTLR start T46 - public final void mT46() throws RecognitionException { + // $ANTLR start "T__46" + public final void mT__46() throws RecognitionException { try { - int _type = T46; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:33:5: ( 'asm' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:33:7: 'asm' + int _type = T__46; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:34:7: ( 'asm' ) + // ACG_ANTLR3.g:34:9: 'asm' { match("asm"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T46 + // $ANTLR end "T__46" - // $ANTLR start T47 - public final void mT47() throws RecognitionException { + // $ANTLR start "T__47" + public final void mT__47() throws RecognitionException { try { - int _type = T47; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:34:5: ( 'name' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:34:7: 'name' + int _type = T__47; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:35:7: ( 'name' ) + // ACG_ANTLR3.g:35:9: 'name' { match("name"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T47 + // $ANTLR end "T__47" - // $ANTLR start T48 - public final void mT48() throws RecognitionException { + // $ANTLR start "T__48" + public final void mT__48() throws RecognitionException { try { - int _type = T48; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:35:5: ( 'code' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:35:7: 'code' + int _type = T__48; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:36:7: ( 'code' ) + // ACG_ANTLR3.g:36:9: 'code' { match("code"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T48 + // $ANTLR end "T__48" - // $ANTLR start T49 - public final void mT49() throws RecognitionException { + // $ANTLR start "T__49" + public final void mT__49() throws RecognitionException { try { - int _type = T49; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:36:5: ( 'mode' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:36:7: 'mode' + int _type = T__49; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:37:7: ( 'mode' ) + // ACG_ANTLR3.g:37:9: 'mode' { match("mode"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T49 + // $ANTLR end "T__49" - // $ANTLR start T50 - public final void mT50() throws RecognitionException { + // $ANTLR start "T__50" + public final void mT__50() throws RecognitionException { try { - int _type = T50; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:37:5: ( 'foreach' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:37:7: 'foreach' + int _type = T__50; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:38:7: ( 'foreach' ) + // ACG_ANTLR3.g:38:9: 'foreach' { match("foreach"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T50 + // $ANTLR end "T__50" - // $ANTLR start T51 - public final void mT51() throws RecognitionException { + // $ANTLR start "T__51" + public final void mT__51() throws RecognitionException { try { - int _type = T51; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:38:5: ( 'in' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:38:7: 'in' + int _type = T__51; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:39:7: ( 'in' ) + // ACG_ANTLR3.g:39:9: 'in' { match("in"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T51 + // $ANTLR end "T__51" - // $ANTLR start T52 - public final void mT52() throws RecognitionException { + // $ANTLR start "T__52" + public final void mT__52() throws RecognitionException { try { - int _type = T52; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:39:5: ( 'variable' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:39:7: 'variable' + int _type = T__52; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:40:7: ( 'variable' ) + // ACG_ANTLR3.g:40:9: 'variable' { match("variable"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T52 + // $ANTLR end "T__52" - // $ANTLR start T53 - public final void mT53() throws RecognitionException { + // $ANTLR start "T__53" + public final void mT__53() throws RecognitionException { try { - int _type = T53; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:40:5: ( 'named' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:40:7: 'named' + int _type = T__53; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:41:7: ( 'named' ) + // ACG_ANTLR3.g:41:9: 'named' { match("named"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T53 + // $ANTLR end "T__53" - // $ANTLR start T54 - public final void mT54() throws RecognitionException { + // $ANTLR start "T__54" + public final void mT__54() throws RecognitionException { try { - int _type = T54; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:41:5: ( 'operation' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:41:7: 'operation' + int _type = T__54; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:42:7: ( 'operation' ) + // ACG_ANTLR3.g:42:9: 'operation' { match("operation"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T54 + // $ANTLR end "T__54" - // $ANTLR start T55 - public final void mT55() throws RecognitionException { + // $ANTLR start "T__55" + public final void mT__55() throws RecognitionException { try { - int _type = T55; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:42:5: ( 'context' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:42:7: 'context' + int _type = T__55; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:43:7: ( 'context' ) + // ACG_ANTLR3.g:43:9: 'context' { match("context"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T55 + // $ANTLR end "T__55" - // $ANTLR start T56 - public final void mT56() throws RecognitionException { + // $ANTLR start "T__56" + public final void mT__56() throws RecognitionException { try { - int _type = T56; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:43:5: ( 'if' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:43:7: 'if' + int _type = T__56; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:44:7: ( 'if' ) + // ACG_ANTLR3.g:44:9: 'if' { match("if"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T56 + // $ANTLR end "T__56" - // $ANTLR start T57 - public final void mT57() throws RecognitionException { + // $ANTLR start "T__57" + public final void mT__57() throws RecognitionException { try { - int _type = T57; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:44:5: ( 'else' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:44:7: 'else' + int _type = T__57; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:45:7: ( 'else' ) + // ACG_ANTLR3.g:45:9: 'else' { match("else"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T57 + // $ANTLR end "T__57" - // $ANTLR start T58 - public final void mT58() throws RecognitionException { + // $ANTLR start "T__58" + public final void mT__58() throws RecognitionException { try { - int _type = T58; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:45:5: ( 'let' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:45:7: 'let' + int _type = T__58; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:46:7: ( 'let' ) + // ACG_ANTLR3.g:46:9: 'let' { match("let"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T58 + // $ANTLR end "T__58" - // $ANTLR start T59 - public final void mT59() throws RecognitionException { + // $ANTLR start "T__59" + public final void mT__59() throws RecognitionException { try { - int _type = T59; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:46:5: ( 'analyze' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:46:7: 'analyze' + int _type = T__59; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:47:7: ( 'analyze' ) + // ACG_ANTLR3.g:47:9: 'analyze' { match("analyze"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T59 + // $ANTLR end "T__59" - // $ANTLR start T60 - public final void mT60() throws RecognitionException { + // $ANTLR start "T__60" + public final void mT__60() throws RecognitionException { try { - int _type = T60; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:47:5: ( 'report' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:47:7: 'report' + int _type = T__60; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:48:7: ( 'report' ) + // ACG_ANTLR3.g:48:9: 'report' { match("report"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T60 + // $ANTLR end "T__60" - // $ANTLR start T61 - public final void mT61() throws RecognitionException { + // $ANTLR start "T__61" + public final void mT__61() throws RecognitionException { try { - int _type = T61; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:48:5: ( 'critic' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:48:7: 'critic' + int _type = T__61; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:49:7: ( 'critic' ) + // ACG_ANTLR3.g:49:9: 'critic' { match("critic"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T61 + // $ANTLR end "T__61" - // $ANTLR start T62 - public final void mT62() throws RecognitionException { + // $ANTLR start "T__62" + public final void mT__62() throws RecognitionException { try { - int _type = T62; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:49:5: ( 'error' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:49:7: 'error' + int _type = T__62; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:50:7: ( 'error' ) + // ACG_ANTLR3.g:50:9: 'error' { match("error"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T62 + // $ANTLR end "T__62" - // $ANTLR start T63 - public final void mT63() throws RecognitionException { + // $ANTLR start "T__63" + public final void mT__63() throws RecognitionException { try { - int _type = T63; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:50:5: ( 'warning' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:50:7: 'warning' + int _type = T__63; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:51:7: ( 'warning' ) + // ACG_ANTLR3.g:51:9: 'warning' { match("warning"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T63 + // $ANTLR end "T__63" - // $ANTLR start T64 - public final void mT64() throws RecognitionException { + // $ANTLR start "T__64" + public final void mT__64() throws RecognitionException { try { - int _type = T64; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:51:5: ( 'field' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:51:7: 'field' + int _type = T__64; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:52:7: ( 'field' ) + // ACG_ANTLR3.g:52:9: 'field' { match("field"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T64 + // $ANTLR end "T__64" - // $ANTLR start T65 - public final void mT65() throws RecognitionException { + // $ANTLR start "T__65" + public final void mT__65() throws RecognitionException { try { - int _type = T65; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:52:5: ( 'param' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:52:7: 'param' + int _type = T__65; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:53:7: ( 'param' ) + // ACG_ANTLR3.g:53:9: 'param' { match("param"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T65 + // $ANTLR end "T__65" - // $ANTLR start T66 - public final void mT66() throws RecognitionException { + // $ANTLR start "T__66" + public final void mT__66() throws RecognitionException { try { - int _type = T66; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:53:5: ( 'new' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:53:7: 'new' + int _type = T__66; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:54:7: ( 'new' ) + // ACG_ANTLR3.g:54:9: 'new' { match("new"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T66 + // $ANTLR end "T__66" - // $ANTLR start T67 - public final void mT67() throws RecognitionException { + // $ANTLR start "T__67" + public final void mT__67() throws RecognitionException { try { - int _type = T67; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:54:5: ( 'dup' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:54:7: 'dup' + int _type = T__67; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:55:7: ( 'newin' ) + // ACG_ANTLR3.g:55:9: 'newin' + { + match("newin"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__67" + + // $ANTLR start "T__68" + public final void mT__68() throws RecognitionException { + try { + int _type = T__68; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:56:7: ( 'delete' ) + // ACG_ANTLR3.g:56:9: 'delete' + { + match("delete"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__68" + + // $ANTLR start "T__69" + public final void mT__69() throws RecognitionException { + try { + int _type = T__69; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:57:7: ( 'dup' ) + // ACG_ANTLR3.g:57:9: 'dup' { match("dup"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T67 + // $ANTLR end "T__69" - // $ANTLR start T68 - public final void mT68() throws RecognitionException { + // $ANTLR start "T__70" + public final void mT__70() throws RecognitionException { try { - int _type = T68; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:55:5: ( 'dup_x1' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:55:7: 'dup_x1' + int _type = T__70; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:58:7: ( 'dup_x1' ) + // ACG_ANTLR3.g:58:9: 'dup_x1' { match("dup_x1"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T68 + // $ANTLR end "T__70" - // $ANTLR start T69 - public final void mT69() throws RecognitionException { + // $ANTLR start "T__71" + public final void mT__71() throws RecognitionException { try { - int _type = T69; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:56:5: ( 'pop' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:56:7: 'pop' + int _type = T__71; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:59:7: ( 'pop' ) + // ACG_ANTLR3.g:59:9: 'pop' { match("pop"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T69 + // $ANTLR end "T__71" - // $ANTLR start T70 - public final void mT70() throws RecognitionException { + // $ANTLR start "T__72" + public final void mT__72() throws RecognitionException { try { - int _type = T70; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:57:5: ( 'swap' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:57:7: 'swap' + int _type = T__72; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:60:7: ( 'swap' ) + // ACG_ANTLR3.g:60:9: 'swap' { match("swap"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T70 + // $ANTLR end "T__72" - // $ANTLR start T71 - public final void mT71() throws RecognitionException { + // $ANTLR start "T__73" + public final void mT__73() throws RecognitionException { try { - int _type = T71; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:58:5: ( 'iterate' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:58:7: 'iterate' + int _type = T__73; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:61:7: ( 'iterate' ) + // ACG_ANTLR3.g:61:9: 'iterate' { match("iterate"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T71 + // $ANTLR end "T__73" - // $ANTLR start T72 - public final void mT72() throws RecognitionException { + // $ANTLR start "T__74" + public final void mT__74() throws RecognitionException { try { - int _type = T72; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:59:5: ( 'enditerate' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:59:7: 'enditerate' + int _type = T__74; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:62:7: ( 'enditerate' ) + // ACG_ANTLR3.g:62:9: 'enditerate' { match("enditerate"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T72 + // $ANTLR end "T__74" - // $ANTLR start T73 - public final void mT73() throws RecognitionException { + // $ANTLR start "T__75" + public final void mT__75() throws RecognitionException { try { - int _type = T73; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:60:5: ( 'getasm' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:60:7: 'getasm' + int _type = T__75; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:63:7: ( 'getasm' ) + // ACG_ANTLR3.g:63:9: 'getasm' { match("getasm"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T73 + // $ANTLR end "T__75" - // $ANTLR start T74 - public final void mT74() throws RecognitionException { + // $ANTLR start "T__76" + public final void mT__76() throws RecognitionException { try { - int _type = T74; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:61:5: ( 'findme' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:61:7: 'findme' + int _type = T__76; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:64:7: ( 'findme' ) + // ACG_ANTLR3.g:64:9: 'findme' { match("findme"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T74 + // $ANTLR end "T__76" - // $ANTLR start T75 - public final void mT75() throws RecognitionException { + // $ANTLR start "T__77" + public final void mT__77() throws RecognitionException { try { - int _type = T75; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:62:5: ( 'pusht' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:62:7: 'pusht' + int _type = T__77; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:65:7: ( 'pusht' ) + // ACG_ANTLR3.g:65:9: 'pusht' { match("pusht"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T75 + // $ANTLR end "T__77" - // $ANTLR start T76 - public final void mT76() throws RecognitionException { + // $ANTLR start "T__78" + public final void mT__78() throws RecognitionException { try { - int _type = T76; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:63:5: ( 'pushf' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:63:7: 'pushf' + int _type = T__78; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:66:7: ( 'pushf' ) + // ACG_ANTLR3.g:66:9: 'pushf' { match("pushf"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T76 + // $ANTLR end "T__78" - // $ANTLR start T77 - public final void mT77() throws RecognitionException { + // $ANTLR start "T__79" + public final void mT__79() throws RecognitionException { try { - int _type = T77; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:64:5: ( 'push' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:64:7: 'push' + int _type = T__79; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:67:7: ( 'push' ) + // ACG_ANTLR3.g:67:9: 'push' { match("push"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T77 + // $ANTLR end "T__79" - // $ANTLR start T78 - public final void mT78() throws RecognitionException { + // $ANTLR start "T__80" + public final void mT__80() throws RecognitionException { try { - int _type = T78; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:65:5: ( 'pushi' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:65:7: 'pushi' + int _type = T__80; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:68:7: ( 'pushi' ) + // ACG_ANTLR3.g:68:9: 'pushi' { match("pushi"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T78 + // $ANTLR end "T__80" - // $ANTLR start T79 - public final void mT79() throws RecognitionException { + // $ANTLR start "T__81" + public final void mT__81() throws RecognitionException { try { - int _type = T79; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:66:5: ( 'pushd' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:66:7: 'pushd' + int _type = T__81; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:69:7: ( 'pushd' ) + // ACG_ANTLR3.g:69:9: 'pushd' { match("pushd"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T79 + // $ANTLR end "T__81" - // $ANTLR start T80 - public final void mT80() throws RecognitionException { + // $ANTLR start "T__82" + public final void mT__82() throws RecognitionException { try { - int _type = T80; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:67:5: ( 'load' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:67:7: 'load' + int _type = T__82; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:70:7: ( 'load' ) + // ACG_ANTLR3.g:70:9: 'load' { match("load"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T80 + // $ANTLR end "T__82" - // $ANTLR start T81 - public final void mT81() throws RecognitionException { + // $ANTLR start "T__83" + public final void mT__83() throws RecognitionException { try { - int _type = T81; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:68:5: ( 'store' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:68:7: 'store' + int _type = T__83; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:71:7: ( 'store' ) + // ACG_ANTLR3.g:71:9: 'store' { match("store"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T81 + // $ANTLR end "T__83" - // $ANTLR start T82 - public final void mT82() throws RecognitionException { + // $ANTLR start "T__84" + public final void mT__84() throws RecognitionException { try { - int _type = T82; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:69:5: ( 'call' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:69:7: 'call' + int _type = T__84; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:72:7: ( 'call' ) + // ACG_ANTLR3.g:72:9: 'call' { match("call"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T82 + // $ANTLR end "T__84" - // $ANTLR start T83 - public final void mT83() throws RecognitionException { + // $ANTLR start "T__85" + public final void mT__85() throws RecognitionException { try { - int _type = T83; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:70:5: ( 'supercall' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:70:7: 'supercall' + int _type = T__85; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:73:7: ( 'pcall' ) + // ACG_ANTLR3.g:73:9: 'pcall' + { + match("pcall"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__85" + + // $ANTLR start "T__86" + public final void mT__86() throws RecognitionException { + try { + int _type = T__86; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:74:7: ( 'supercall' ) + // ACG_ANTLR3.g:74:9: 'supercall' { match("supercall"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T83 + // $ANTLR end "T__86" - // $ANTLR start T84 - public final void mT84() throws RecognitionException { + // $ANTLR start "T__87" + public final void mT__87() throws RecognitionException { try { - int _type = T84; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:71:5: ( 'get' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:71:7: 'get' + int _type = T__87; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:75:7: ( 'get' ) + // ACG_ANTLR3.g:75:9: 'get' { match("get"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T84 + // $ANTLR end "T__87" - // $ANTLR start T85 - public final void mT85() throws RecognitionException { + // $ANTLR start "T__88" + public final void mT__88() throws RecognitionException { try { - int _type = T85; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:72:5: ( 'set' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:72:7: 'set' + int _type = T__88; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:76:7: ( 'set' ) + // ACG_ANTLR3.g:76:9: 'set' { match("set"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T85 + // $ANTLR end "T__88" - // $ANTLR start T86 - public final void mT86() throws RecognitionException { + // $ANTLR start "T__89" + public final void mT__89() throws RecognitionException { try { - int _type = T86; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:73:5: ( 'goto' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:73:7: 'goto' + int _type = T__89; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:77:7: ( 'goto' ) + // ACG_ANTLR3.g:77:9: 'goto' { match("goto"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T86 + // $ANTLR end "T__89" - // $ANTLR start T87 - public final void mT87() throws RecognitionException { + // $ANTLR start "T__90" + public final void mT__90() throws RecognitionException { try { - int _type = T87; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:74:5: ( 'self' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:74:7: 'self' + int _type = T__90; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:78:7: ( 'self' ) + // ACG_ANTLR3.g:78:9: 'self' { match("self"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T87 + // $ANTLR end "T__90" - // $ANTLR start T88 - public final void mT88() throws RecognitionException { + // $ANTLR start "T__91" + public final void mT__91() throws RecognitionException { try { - int _type = T88; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:75:5: ( 'last' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:75:7: 'last' + int _type = T__91; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:79:7: ( 'last' ) + // ACG_ANTLR3.g:79:9: 'last' { match("last"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T88 + // $ANTLR end "T__91" - // $ANTLR start T89 - public final void mT89() throws RecognitionException { + // $ANTLR start "T__92" + public final void mT__92() throws RecognitionException { try { - int _type = T89; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:76:5: ( 'then' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:76:7: 'then' + int _type = T__92; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:80:7: ( 'then' ) + // ACG_ANTLR3.g:80:9: 'then' { match("then"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T89 + // $ANTLR end "T__92" - // $ANTLR start T90 - public final void mT90() throws RecognitionException { + // $ANTLR start "T__93" + public final void mT__93() throws RecognitionException { try { - int _type = T90; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:5: ( 'endif' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:7: 'endif' + int _type = T__93; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:81:7: ( 'endif' ) + // ACG_ANTLR3.g:81:9: 'endif' { match("endif"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T90 + // $ANTLR end "T__93" - // $ANTLR start T91 - public final void mT91() throws RecognitionException { + // $ANTLR start "T__94" + public final void mT__94() throws RecognitionException { try { - int _type = T91; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:78:5: ( 'OclUndefined' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:78:7: 'OclUndefined' + int _type = T__94; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:82:7: ( 'OclUndefined' ) + // ACG_ANTLR3.g:82:9: 'OclUndefined' { match("OclUndefined"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T91 + // $ANTLR end "T__94" - // $ANTLR start T92 - public final void mT92() throws RecognitionException { + // $ANTLR start "T__95" + public final void mT__95() throws RecognitionException { try { - int _type = T92; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:79:5: ( 'Sequence' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:79:7: 'Sequence' + int _type = T__95; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:83:7: ( 'Sequence' ) + // ACG_ANTLR3.g:83:9: 'Sequence' { match("Sequence"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T92 + // $ANTLR end "T__95" - // $ANTLR start T93 - public final void mT93() throws RecognitionException { + // $ANTLR start "T__96" + public final void mT__96() throws RecognitionException { try { - int _type = T93; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:80:5: ( 'true' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:80:7: 'true' + int _type = T__96; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:84:7: ( 'true' ) + // ACG_ANTLR3.g:84:9: 'true' { match("true"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T93 + // $ANTLR end "T__96" - // $ANTLR start T94 - public final void mT94() throws RecognitionException { + // $ANTLR start "T__97" + public final void mT__97() throws RecognitionException { try { - int _type = T94; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:81:5: ( 'false' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:81:7: 'false' + int _type = T__97; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:85:7: ( 'false' ) + // ACG_ANTLR3.g:85:9: 'false' { match("false"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T94 + // $ANTLR end "T__97" - // $ANTLR start T95 - public final void mT95() throws RecognitionException { + // $ANTLR start "T__98" + public final void mT__98() throws RecognitionException { try { - int _type = T95; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:82:5: ( 'not' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:82:7: 'not' + int _type = T__98; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:86:7: ( 'not' ) + // ACG_ANTLR3.g:86:9: 'not' { match("not"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T95 + // $ANTLR end "T__98" - // $ANTLR start T96 - public final void mT96() throws RecognitionException { + // $ANTLR start "T__99" + public final void mT__99() throws RecognitionException { try { - int _type = T96; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:83:5: ( 'div' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:83:7: 'div' + int _type = T__99; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:87:7: ( 'div' ) + // ACG_ANTLR3.g:87:9: 'div' { match("div"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T96 + // $ANTLR end "T__99" - // $ANTLR start T97 - public final void mT97() throws RecognitionException { + // $ANTLR start "T__100" + public final void mT__100() throws RecognitionException { try { - int _type = T97; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:84:5: ( 'mod' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:84:7: 'mod' + int _type = T__100; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:88:8: ( 'mod' ) + // ACG_ANTLR3.g:88:10: 'mod' { match("mod"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T97 + // $ANTLR end "T__100" - // $ANTLR start T98 - public final void mT98() throws RecognitionException { + // $ANTLR start "T__101" + public final void mT__101() throws RecognitionException { try { - int _type = T98; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:85:5: ( 'isa' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:85:7: 'isa' + int _type = T__101; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:89:8: ( 'isa' ) + // ACG_ANTLR3.g:89:10: 'isa' { match("isa"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T98 + // $ANTLR end "T__101" - // $ANTLR start T99 - public final void mT99() throws RecognitionException { + // $ANTLR start "T__102" + public final void mT__102() throws RecognitionException { try { - int _type = T99; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:86:5: ( 'and' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:86:7: 'and' + int _type = T__102; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:90:8: ( 'and' ) + // ACG_ANTLR3.g:90:10: 'and' { match("and"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T99 + // $ANTLR end "T__102" - // $ANTLR start T100 - public final void mT100() throws RecognitionException { + // $ANTLR start "T__103" + public final void mT__103() throws RecognitionException { try { - int _type = T100; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:87:6: ( 'or' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:87:8: 'or' + int _type = T__103; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:91:8: ( 'or' ) + // ACG_ANTLR3.g:91:10: 'or' { match("or"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T100 + // $ANTLR end "T__103" - // $ANTLR start T101 - public final void mT101() throws RecognitionException { + // $ANTLR start "T__104" + public final void mT__104() throws RecognitionException { try { - int _type = T101; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:88:6: ( 'xor' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:88:8: 'xor' + int _type = T__104; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:92:8: ( 'xor' ) + // ACG_ANTLR3.g:92:10: 'xor' { match("xor"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T101 + // $ANTLR end "T__104" - // $ANTLR start T102 - public final void mT102() throws RecognitionException { + // $ANTLR start "T__105" + public final void mT__105() throws RecognitionException { try { - int _type = T102; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:89:6: ( 'implies' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:89:8: 'implies' + int _type = T__105; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:93:8: ( 'implies' ) + // ACG_ANTLR3.g:93:10: 'implies' { match("implies"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T102 + // $ANTLR end "T__105" - // $ANTLR start NL + // $ANTLR start "NL" public final void mNL() throws RecognitionException { try { int _type = NL; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:898:2: ( ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:898:4: ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' ) + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:931:2: ( ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' ) ) + // ACG_ANTLR3.g:931:4: ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:898:4: ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' ) + // ACG_ANTLR3.g:931:4: ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' ) int alt1=4; int LA1_0 = input.LA(1); @@ -1340,13 +1525,13 @@ public class ACG_ANTLR3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("898:4: ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' )", 1, 0, input); + new NoViableAltException("", 1, 0, input); throw nvae; } switch (alt1) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:898:6: '\\r' '\\n' + // ACG_ANTLR3.g:931:6: '\\r' '\\n' { match('\r'); match('\n'); @@ -1354,7 +1539,7 @@ public class ACG_ANTLR3Lexer extends Lexer { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:899:5: '\\n' '\\r' + // ACG_ANTLR3.g:932:5: '\\n' '\\r' { match('\n'); match('\r'); @@ -1362,14 +1547,14 @@ public class ACG_ANTLR3Lexer extends Lexer { } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:900:5: '\\r' + // ACG_ANTLR3.g:933:5: '\\r' { match('\r'); } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:901:5: '\\n' + // ACG_ANTLR3.g:934:5: '\\n' { match('\n'); @@ -1382,45 +1567,47 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end NL + // $ANTLR end "NL" - // $ANTLR start WS + // $ANTLR start "WS" public final void mWS() throws RecognitionException { try { int _type = WS; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:907:2: ( ( ' ' | '\\t' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:907:4: ( ' ' | '\\t' ) + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:940:2: ( ( ' ' | '\\t' ) ) + // ACG_ANTLR3.g:940:4: ( ' ' | '\\t' ) { if ( input.LA(1)=='\t'||input.LA(1)==' ' ) { input.consume(); } else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end WS + // $ANTLR end "WS" - // $ANTLR start DIGIT + // $ANTLR start "DIGIT" public final void mDIGIT() throws RecognitionException { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:914:2: ( '0' .. '9' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:914:4: '0' .. '9' + // ACG_ANTLR3.g:947:2: ( '0' .. '9' ) + // ACG_ANTLR3.g:947:4: '0' .. '9' { matchRange('0','9'); @@ -1430,23 +1617,22 @@ public class ACG_ANTLR3Lexer extends Lexer { finally { } } - // $ANTLR end DIGIT + // $ANTLR end "DIGIT" - // $ANTLR start ALPHA + // $ANTLR start "ALPHA" public final void mALPHA() throws RecognitionException { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:919:2: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '\\u00C0' .. '\\u00D6' | '\\u00D8' .. '\\u00F6' | '\\u00F8' .. '\\u00FF' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g: + // ACG_ANTLR3.g:952:2: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '\\u00C0' .. '\\u00D6' | '\\u00D8' .. '\\u00F6' | '\\u00F8' .. '\\u00FF' ) + // ACG_ANTLR3.g: { if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00D6')||(input.LA(1)>='\u00D8' && input.LA(1)<='\u00F6')||(input.LA(1)>='\u00F8' && input.LA(1)<='\u00FF') ) { input.consume(); } else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } @@ -1455,22 +1641,22 @@ public class ACG_ANTLR3Lexer extends Lexer { finally { } } - // $ANTLR end ALPHA + // $ANTLR end "ALPHA" - // $ANTLR start SNAME + // $ANTLR start "SNAME" public final void mSNAME() throws RecognitionException { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:933:2: ( ( ALPHA ) ( ALPHA | DIGIT )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:933:4: ( ALPHA ) ( ALPHA | DIGIT )* + // ACG_ANTLR3.g:966:2: ( ( ALPHA ) ( ALPHA | DIGIT )* ) + // ACG_ANTLR3.g:966:4: ( ALPHA ) ( ALPHA | DIGIT )* { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:933:4: ( ALPHA ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:933:5: ALPHA + // ACG_ANTLR3.g:966:4: ( ALPHA ) + // ACG_ANTLR3.g:966:5: ALPHA { mALPHA(); } - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:933:12: ( ALPHA | DIGIT )* + // ACG_ANTLR3.g:966:12: ( ALPHA | DIGIT )* loop2: do { int alt2=2; @@ -1483,17 +1669,16 @@ public class ACG_ANTLR3Lexer extends Lexer { switch (alt2) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g: + // ACG_ANTLR3.g: { if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00D6')||(input.LA(1)>='\u00D8' && input.LA(1)<='\u00F6')||(input.LA(1)>='\u00F8' && input.LA(1)<='\u00FF') ) { input.consume(); } else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } @@ -1511,16 +1696,17 @@ public class ACG_ANTLR3Lexer extends Lexer { finally { } } - // $ANTLR end SNAME + // $ANTLR end "SNAME" - // $ANTLR start NAME + // $ANTLR start "NAME" public final void mNAME() throws RecognitionException { try { int _type = NAME; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:937:2: ( ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:937:4: ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' ) + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:970:2: ( ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' ) ) + // ACG_ANTLR3.g:970:4: ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:937:4: ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' ) + // ACG_ANTLR3.g:970:4: ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' ) int alt4=2; int LA4_0 = input.LA(1); @@ -1532,23 +1718,23 @@ public class ACG_ANTLR3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("937:4: ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' )", 4, 0, input); + new NoViableAltException("", 4, 0, input); throw nvae; } switch (alt4) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:938:4: SNAME + // ACG_ANTLR3.g:971:4: SNAME { mSNAME(); } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:940:5: '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' + // ACG_ANTLR3.g:973:5: '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' { match('\"'); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:941:4: ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* + // ACG_ANTLR3.g:974:4: ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* loop3: do { int alt3=4; @@ -1560,21 +1746,21 @@ public class ACG_ANTLR3Lexer extends Lexer { else if ( (LA3_0=='\n') ) { alt3=2; } - else if ( ((LA3_0>='\u0000' && LA3_0<='\t')||(LA3_0>='\u000B' && LA3_0<='!')||(LA3_0>='#' && LA3_0<='[')||(LA3_0>=']' && LA3_0<='\uFFFE')) ) { + else if ( ((LA3_0>='\u0000' && LA3_0<='\t')||(LA3_0>='\u000B' && LA3_0<='!')||(LA3_0>='#' && LA3_0<='[')||(LA3_0>=']' && LA3_0<='\uFFFF')) ) { alt3=3; } switch (alt3) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:941:6: ESC + // ACG_ANTLR3.g:974:6: ESC { mESC(); } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:942:6: '\\n' + // ACG_ANTLR3.g:975:6: '\\n' { match('\n'); newline(); @@ -1582,17 +1768,16 @@ public class ACG_ANTLR3Lexer extends Lexer { } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:943:6: ~ ( '\\\\' | '\\\"' | '\\n' ) + // ACG_ANTLR3.g:976:6: ~ ( '\\\\' | '\\\"' | '\\n' ) { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { + if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); } else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } @@ -1614,21 +1799,23 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end NAME + // $ANTLR end "NAME" - // $ANTLR start INT + // $ANTLR start "INT" public final void mINT() throws RecognitionException { try { int _type = INT; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:951:2: ( ( DIGIT )+ ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:951:4: ( DIGIT )+ + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:984:2: ( ( DIGIT )+ ) + // ACG_ANTLR3.g:984:4: ( DIGIT )+ { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:951:4: ( DIGIT )+ + // ACG_ANTLR3.g:984:4: ( DIGIT )+ int cnt5=0; loop5: do { @@ -1642,7 +1829,7 @@ public class ACG_ANTLR3Lexer extends Lexer { switch (alt5) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:951:5: DIGIT + // ACG_ANTLR3.g:984:5: DIGIT { mDIGIT(); @@ -1661,21 +1848,23 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end INT + // $ANTLR end "INT" - // $ANTLR start FLOAT + // $ANTLR start "FLOAT" public final void mFLOAT() throws RecognitionException { try { int _type = FLOAT; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:955:7: ( ( DIGIT )+ '.' ( DIGIT )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:955:9: ( DIGIT )+ '.' ( DIGIT )* + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:988:7: ( ( DIGIT )+ '.' ( DIGIT )* ) + // ACG_ANTLR3.g:988:9: ( DIGIT )+ '.' ( DIGIT )* { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:955:9: ( DIGIT )+ + // ACG_ANTLR3.g:988:9: ( DIGIT )+ int cnt6=0; loop6: do { @@ -1689,7 +1878,7 @@ public class ACG_ANTLR3Lexer extends Lexer { switch (alt6) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:955:9: DIGIT + // ACG_ANTLR3.g:988:9: DIGIT { mDIGIT(); @@ -1706,7 +1895,7 @@ public class ACG_ANTLR3Lexer extends Lexer { } while (true); match('.'); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:955:20: ( DIGIT )* + // ACG_ANTLR3.g:988:20: ( DIGIT )* loop7: do { int alt7=2; @@ -1719,7 +1908,7 @@ public class ACG_ANTLR3Lexer extends Lexer { switch (alt7) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:955:20: DIGIT + // ACG_ANTLR3.g:988:20: DIGIT { mDIGIT(); @@ -1734,21 +1923,22 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end FLOAT + // $ANTLR end "FLOAT" - // $ANTLR start ESC + // $ANTLR start "ESC" public final void mESC() throws RecognitionException { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:959:2: ( '\\\\' ( 'n' | 'r' | 't' | 'b' | 'f' | '\"' | '\\'' | '\\\\' | ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:959:4: '\\\\' ( 'n' | 'r' | 't' | 'b' | 'f' | '\"' | '\\'' | '\\\\' | ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) ) + // ACG_ANTLR3.g:992:2: ( '\\\\' ( 'n' | 'r' | 't' | 'b' | 'f' | '\"' | '\\'' | '\\\\' | ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) ) ) + // ACG_ANTLR3.g:992:4: '\\\\' ( 'n' | 'r' | 't' | 'b' | 'f' | '\"' | '\\'' | '\\\\' | ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) ) { match('\\'); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:960:3: ( 'n' | 'r' | 't' | 'b' | 'f' | '\"' | '\\'' | '\\\\' | ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) ) + // ACG_ANTLR3.g:993:3: ( 'n' | 'r' | 't' | 'b' | 'f' | '\"' | '\\'' | '\\\\' | ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) ) int alt12=9; switch ( input.LA(1) ) { case 'n': @@ -1805,72 +1995,72 @@ public class ACG_ANTLR3Lexer extends Lexer { break; default: NoViableAltException nvae = - new NoViableAltException("960:3: ( 'n' | 'r' | 't' | 'b' | 'f' | '\"' | '\\'' | '\\\\' | ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) )", 12, 0, input); + new NoViableAltException("", 12, 0, input); throw nvae; } switch (alt12) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:960:5: 'n' + // ACG_ANTLR3.g:993:5: 'n' { match('n'); } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:961:5: 'r' + // ACG_ANTLR3.g:994:5: 'r' { match('r'); } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:962:5: 't' + // ACG_ANTLR3.g:995:5: 't' { match('t'); } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:963:5: 'b' + // ACG_ANTLR3.g:996:5: 'b' { match('b'); } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:964:5: 'f' + // ACG_ANTLR3.g:997:5: 'f' { match('f'); } break; case 6 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:965:5: '\"' + // ACG_ANTLR3.g:998:5: '\"' { match('\"'); } break; case 7 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:966:5: '\\'' + // ACG_ANTLR3.g:999:5: '\\'' { match('\''); } break; case 8 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:967:5: '\\\\' + // ACG_ANTLR3.g:1000:5: '\\\\' { match('\\'); } break; case 9 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:968:5: ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) + // ACG_ANTLR3.g:1001:5: ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:968:5: ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) + // ACG_ANTLR3.g:1001:5: ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) int alt11=2; int LA11_0 = input.LA(1); @@ -1882,22 +2072,22 @@ public class ACG_ANTLR3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("968:5: ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? )", 11, 0, input); + new NoViableAltException("", 11, 0, input); throw nvae; } switch (alt11) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:969:5: ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? + // ACG_ANTLR3.g:1002:5: ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:969:5: ( '0' .. '3' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:969:6: '0' .. '3' + // ACG_ANTLR3.g:1002:5: ( '0' .. '3' ) + // ACG_ANTLR3.g:1002:6: '0' .. '3' { matchRange('0','3'); } - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:970:5: ( ( '0' .. '7' ) ( '0' .. '7' )? )? + // ACG_ANTLR3.g:1003:5: ( ( '0' .. '7' ) ( '0' .. '7' )? )? int alt9=2; int LA9_0 = input.LA(1); @@ -1906,16 +2096,16 @@ public class ACG_ANTLR3Lexer extends Lexer { } switch (alt9) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:974:7: ( '0' .. '7' ) ( '0' .. '7' )? + // ACG_ANTLR3.g:1007:7: ( '0' .. '7' ) ( '0' .. '7' )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:974:7: ( '0' .. '7' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:974:8: '0' .. '7' + // ACG_ANTLR3.g:1007:7: ( '0' .. '7' ) + // ACG_ANTLR3.g:1007:8: '0' .. '7' { matchRange('0','7'); } - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:975:6: ( '0' .. '7' )? + // ACG_ANTLR3.g:1008:6: ( '0' .. '7' )? int alt8=2; int LA8_0 = input.LA(1); @@ -1924,7 +2114,7 @@ public class ACG_ANTLR3Lexer extends Lexer { } switch (alt8) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:979:8: '0' .. '7' + // ACG_ANTLR3.g:1012:8: '0' .. '7' { matchRange('0','7'); @@ -1943,16 +2133,16 @@ public class ACG_ANTLR3Lexer extends Lexer { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:982:6: ( '4' .. '7' ) ( ( '0' .. '7' ) )? + // ACG_ANTLR3.g:1015:6: ( '4' .. '7' ) ( ( '0' .. '7' ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:982:6: ( '4' .. '7' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:982:7: '4' .. '7' + // ACG_ANTLR3.g:1015:6: ( '4' .. '7' ) + // ACG_ANTLR3.g:1015:7: '4' .. '7' { matchRange('4','7'); } - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:983:5: ( ( '0' .. '7' ) )? + // ACG_ANTLR3.g:1016:5: ( ( '0' .. '7' ) )? int alt10=2; int LA10_0 = input.LA(1); @@ -1961,10 +2151,10 @@ public class ACG_ANTLR3Lexer extends Lexer { } switch (alt10) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:987:7: ( '0' .. '7' ) + // ACG_ANTLR3.g:1020:7: ( '0' .. '7' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:987:7: ( '0' .. '7' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:987:8: '0' .. '7' + // ACG_ANTLR3.g:1020:7: ( '0' .. '7' ) + // ACG_ANTLR3.g:1020:8: '0' .. '7' { matchRange('0','7'); @@ -1982,7 +2172,7 @@ public class ACG_ANTLR3Lexer extends Lexer { } - + // String s = getText(); // int i; // int ret = 0; @@ -2005,14 +2195,145 @@ public class ACG_ANTLR3Lexer extends Lexer { finally { } } - // $ANTLR end ESC + // $ANTLR end "ESC" + + // $ANTLR start "STRING" + public final void mSTRING() throws RecognitionException { + try { + int _type = STRING; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1036:2: ( ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) ) + // ACG_ANTLR3.g:1036:4: ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) + { + // ACG_ANTLR3.g:1036:4: ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) + // ACG_ANTLR3.g:1036:5: ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) + { + // ACG_ANTLR3.g:1036:5: ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) + // ACG_ANTLR3.g:1036:6: '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' + { + match('\''); + // ACG_ANTLR3.g:1036:11: ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* + loop14: + do { + int alt14=2; + int LA14_0 = input.LA(1); + + if ( (LA14_0=='\'') ) { + alt14=2; + } + else if ( ((LA14_0>='\u0000' && LA14_0<='&')||(LA14_0>='(' && LA14_0<='\uFFFF')) ) { + alt14=1; + } + + + switch (alt14) { + case 1 : + // ACG_ANTLR3.g:1036:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) + { + // ACG_ANTLR3.g:1036:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) + int alt13=3; + int LA13_0 = input.LA(1); + + if ( (LA13_0=='\\') ) { + alt13=1; + } + else if ( (LA13_0=='\n') ) { + alt13=2; + } + else if ( ((LA13_0>='\u0000' && LA13_0<='\t')||(LA13_0>='\u000B' && LA13_0<='[')||(LA13_0>=']' && LA13_0<='\uFFFF')) ) { + alt13=3; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 13, 0, input); + + throw nvae; + } + switch (alt13) { + case 1 : + // ACG_ANTLR3.g:1036:41: ( '\\\\' ~ '\\n' ) + { + // ACG_ANTLR3.g:1036:41: ( '\\\\' ~ '\\n' ) + // ACG_ANTLR3.g:1036:42: '\\\\' ~ '\\n' + { + match('\\'); + if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\uFFFF') ) { + input.consume(); + + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} + + + } + + + } + break; + case 2 : + // ACG_ANTLR3.g:1036:56: '\\n' + { + match('\n'); + + } + break; + case 3 : + // ACG_ANTLR3.g:1036:62: ~ ( '\\\\' | '\\n' ) + { + if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { + input.consume(); + + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} + + + } + break; + + } + + + } + break; + + default : + break loop14; + } + } while (true); + + match('\''); + + } + + + } + + + + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "STRING" - // $ANTLR start LSQUARE + // $ANTLR start "LSQUARE" public final void mLSQUARE() throws RecognitionException { try { int _type = LSQUARE; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1005:2: ( '[' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1005:4: '[' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1045:2: ( '[' ) + // ACG_ANTLR3.g:1045:4: '[' { match('['); @@ -2021,19 +2342,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LSQUARE + // $ANTLR end "LSQUARE" - // $ANTLR start RSQUARE + // $ANTLR start "RSQUARE" public final void mRSQUARE() throws RecognitionException { try { int _type = RSQUARE; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1013:2: ( ']' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1013:4: ']' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1053:2: ( ']' ) + // ACG_ANTLR3.g:1053:4: ']' { match(']'); @@ -2042,19 +2365,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end RSQUARE + // $ANTLR end "RSQUARE" - // $ANTLR start EXCL + // $ANTLR start "EXCL" public final void mEXCL() throws RecognitionException { try { int _type = EXCL; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1021:2: ( '!' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1021:4: '!' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1061:2: ( '!' ) + // ACG_ANTLR3.g:1061:4: '!' { match('!'); @@ -2063,19 +2388,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end EXCL + // $ANTLR end "EXCL" - // $ANTLR start COMA + // $ANTLR start "COMA" public final void mCOMA() throws RecognitionException { try { int _type = COMA; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1029:2: ( ',' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1029:4: ',' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1069:2: ( ',' ) + // ACG_ANTLR3.g:1069:4: ',' { match(','); @@ -2084,19 +2411,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end COMA + // $ANTLR end "COMA" - // $ANTLR start LPAREN + // $ANTLR start "LPAREN" public final void mLPAREN() throws RecognitionException { try { int _type = LPAREN; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1037:2: ( '(' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1037:4: '(' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1077:2: ( '(' ) + // ACG_ANTLR3.g:1077:4: '(' { match('('); @@ -2105,19 +2434,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LPAREN + // $ANTLR end "LPAREN" - // $ANTLR start RPAREN + // $ANTLR start "RPAREN" public final void mRPAREN() throws RecognitionException { try { int _type = RPAREN; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1045:2: ( ')' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1045:4: ')' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1085:2: ( ')' ) + // ACG_ANTLR3.g:1085:4: ')' { match(')'); @@ -2126,19 +2457,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end RPAREN + // $ANTLR end "RPAREN" - // $ANTLR start LCURLY + // $ANTLR start "LCURLY" public final void mLCURLY() throws RecognitionException { try { int _type = LCURLY; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1053:2: ( '{' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1053:4: '{' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1093:2: ( '{' ) + // ACG_ANTLR3.g:1093:4: '{' { match('{'); @@ -2147,19 +2480,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LCURLY + // $ANTLR end "LCURLY" - // $ANTLR start RCURLY + // $ANTLR start "RCURLY" public final void mRCURLY() throws RecognitionException { try { int _type = RCURLY; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1061:2: ( '}' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1061:4: '}' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1101:2: ( '}' ) + // ACG_ANTLR3.g:1101:4: '}' { match('}'); @@ -2168,19 +2503,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end RCURLY + // $ANTLR end "RCURLY" - // $ANTLR start SEMI + // $ANTLR start "SEMI" public final void mSEMI() throws RecognitionException { try { int _type = SEMI; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1069:2: ( ';' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1069:4: ';' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1109:2: ( ';' ) + // ACG_ANTLR3.g:1109:4: ';' { match(';'); @@ -2189,19 +2526,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end SEMI + // $ANTLR end "SEMI" - // $ANTLR start COLON + // $ANTLR start "COLON" public final void mCOLON() throws RecognitionException { try { int _type = COLON; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1077:2: ( ':' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1077:4: ':' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1117:2: ( ':' ) + // ACG_ANTLR3.g:1117:4: ':' { match(':'); @@ -2210,19 +2549,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end COLON + // $ANTLR end "COLON" - // $ANTLR start PIPE + // $ANTLR start "PIPE" public final void mPIPE() throws RecognitionException { try { int _type = PIPE; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1085:2: ( '|' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1085:4: '|' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1125:2: ( '|' ) + // ACG_ANTLR3.g:1125:4: '|' { match('|'); @@ -2231,19 +2572,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end PIPE + // $ANTLR end "PIPE" - // $ANTLR start SHARP + // $ANTLR start "SHARP" public final void mSHARP() throws RecognitionException { try { int _type = SHARP; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1093:2: ( '#' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1093:4: '#' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1133:2: ( '#' ) + // ACG_ANTLR3.g:1133:4: '#' { match('#'); @@ -2252,19 +2595,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end SHARP + // $ANTLR end "SHARP" - // $ANTLR start QMARK + // $ANTLR start "QMARK" public final void mQMARK() throws RecognitionException { try { int _type = QMARK; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1101:2: ( '?' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1101:4: '?' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1141:2: ( '?' ) + // ACG_ANTLR3.g:1141:4: '?' { match('?'); @@ -2273,19 +2618,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end QMARK + // $ANTLR end "QMARK" - // $ANTLR start COLONCOLON + // $ANTLR start "COLONCOLON" public final void mCOLONCOLON() throws RecognitionException { try { int _type = COLONCOLON; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1109:2: ( '::' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1109:4: '::' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1149:2: ( '::' ) + // ACG_ANTLR3.g:1149:4: '::' { match("::"); @@ -2295,19 +2642,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end COLONCOLON + // $ANTLR end "COLONCOLON" - // $ANTLR start POINT + // $ANTLR start "POINT" public final void mPOINT() throws RecognitionException { try { int _type = POINT; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1117:2: ( '.' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1117:4: '.' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1157:2: ( '.' ) + // ACG_ANTLR3.g:1157:4: '.' { match('.'); @@ -2316,19 +2665,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end POINT + // $ANTLR end "POINT" - // $ANTLR start RARROW + // $ANTLR start "RARROW" public final void mRARROW() throws RecognitionException { try { int _type = RARROW; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1125:2: ( '->' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1125:4: '->' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1165:2: ( '->' ) + // ACG_ANTLR3.g:1165:4: '->' { match("->"); @@ -2338,19 +2689,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end RARROW + // $ANTLR end "RARROW" - // $ANTLR start MINUS + // $ANTLR start "MINUS" public final void mMINUS() throws RecognitionException { try { int _type = MINUS; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1133:2: ( '-' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1133:4: '-' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1173:2: ( '-' ) + // ACG_ANTLR3.g:1173:4: '-' { match('-'); @@ -2359,19 +2712,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end MINUS + // $ANTLR end "MINUS" - // $ANTLR start STAR + // $ANTLR start "STAR" public final void mSTAR() throws RecognitionException { try { int _type = STAR; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1141:2: ( '*' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1141:4: '*' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1181:2: ( '*' ) + // ACG_ANTLR3.g:1181:4: '*' { match('*'); @@ -2380,19 +2735,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end STAR + // $ANTLR end "STAR" - // $ANTLR start SLASH + // $ANTLR start "SLASH" public final void mSLASH() throws RecognitionException { try { int _type = SLASH; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1149:2: ( '/' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1149:4: '/' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1189:2: ( '/' ) + // ACG_ANTLR3.g:1189:4: '/' { match('/'); @@ -2401,19 +2758,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end SLASH + // $ANTLR end "SLASH" - // $ANTLR start PLUS + // $ANTLR start "PLUS" public final void mPLUS() throws RecognitionException { try { int _type = PLUS; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1157:2: ( '+' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1157:4: '+' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1197:2: ( '+' ) + // ACG_ANTLR3.g:1197:4: '+' { match('+'); @@ -2422,19 +2781,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end PLUS + // $ANTLR end "PLUS" - // $ANTLR start EQ + // $ANTLR start "EQ" public final void mEQ() throws RecognitionException { try { int _type = EQ; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1165:2: ( '=' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1165:4: '=' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1205:2: ( '=' ) + // ACG_ANTLR3.g:1205:4: '=' { match('='); @@ -2443,19 +2804,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end EQ + // $ANTLR end "EQ" - // $ANTLR start GT + // $ANTLR start "GT" public final void mGT() throws RecognitionException { try { int _type = GT; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1173:2: ( '>' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1173:4: '>' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1213:2: ( '>' ) + // ACG_ANTLR3.g:1213:4: '>' { match('>'); @@ -2464,19 +2827,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end GT + // $ANTLR end "GT" - // $ANTLR start LT + // $ANTLR start "LT" public final void mLT() throws RecognitionException { try { int _type = LT; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1181:2: ( '<' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1181:4: '<' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1221:2: ( '<' ) + // ACG_ANTLR3.g:1221:4: '<' { match('<'); @@ -2485,19 +2850,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LT + // $ANTLR end "LT" - // $ANTLR start GE + // $ANTLR start "GE" public final void mGE() throws RecognitionException { try { int _type = GE; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1189:2: ( '>=' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1189:4: '>=' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1229:2: ( '>=' ) + // ACG_ANTLR3.g:1229:4: '>=' { match(">="); @@ -2507,19 +2874,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end GE + // $ANTLR end "GE" - // $ANTLR start LE + // $ANTLR start "LE" public final void mLE() throws RecognitionException { try { int _type = LE; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1197:2: ( '<=' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1197:4: '<=' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1237:2: ( '<=' ) + // ACG_ANTLR3.g:1237:4: '<=' { match("<="); @@ -2529,19 +2898,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LE + // $ANTLR end "LE" - // $ANTLR start NE + // $ANTLR start "NE" public final void mNE() throws RecognitionException { try { int _type = NE; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1205:2: ( '<>' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1205:4: '<>' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1245:2: ( '<>' ) + // ACG_ANTLR3.g:1245:4: '<>' { match("<>"); @@ -2551,19 +2922,21 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end NE + // $ANTLR end "NE" - // $ANTLR start LARROW + // $ANTLR start "LARROW" public final void mLARROW() throws RecognitionException { try { int _type = LARROW; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1213:2: ( '<-' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1213:4: '<-' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1253:2: ( '<-' ) + // ACG_ANTLR3.g:1253:4: '<-' { match("<-"); @@ -2573,181 +2946,53 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LARROW + // $ANTLR end "LARROW" - // $ANTLR start COMMENT + // $ANTLR start "COMMENT" public final void mCOMMENT() throws RecognitionException { try { int _type = COMMENT; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1221:2: ( ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1221:4: ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) + int _channel = DEFAULT_TOKEN_CHANNEL; + // ACG_ANTLR3.g:1261:2: ( ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) ) + // ACG_ANTLR3.g:1261:4: ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1221:4: ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1221:5: ( '--' (~ ( '\\r' | '\\n' ) )* ) + // ACG_ANTLR3.g:1261:4: ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) + // ACG_ANTLR3.g:1261:5: ( '--' (~ ( '\\r' | '\\n' ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1221:5: ( '--' (~ ( '\\r' | '\\n' ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1221:6: '--' (~ ( '\\r' | '\\n' ) )* + // ACG_ANTLR3.g:1261:5: ( '--' (~ ( '\\r' | '\\n' ) )* ) + // ACG_ANTLR3.g:1261:6: '--' (~ ( '\\r' | '\\n' ) )* { match("--"); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1221:11: (~ ( '\\r' | '\\n' ) )* - loop13: - do { - int alt13=2; - int LA13_0 = input.LA(1); - - if ( ((LA13_0>='\u0000' && LA13_0<='\t')||(LA13_0>='\u000B' && LA13_0<='\f')||(LA13_0>='\u000E' && LA13_0<='\uFFFE')) ) { - alt13=1; - } - - - switch (alt13) { - case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1221:12: ~ ( '\\r' | '\\n' ) - { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) { - input.consume(); - - } - else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } - - - } - break; - - default : - break loop13; - } - } while (true); - - - } - - - } - - - - - - } - - this.type = _type; - } - finally { - } - } - // $ANTLR end COMMENT - - // $ANTLR start STRING - public final void mSTRING() throws RecognitionException { - try { - int _type = STRING; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:2: ( ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:4: ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) - { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:4: ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:5: ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) - { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:5: ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:6: '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' - { - match('\''); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:11: ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* + // ACG_ANTLR3.g:1261:11: (~ ( '\\r' | '\\n' ) )* loop15: do { int alt15=2; int LA15_0 = input.LA(1); - if ( (LA15_0=='\'') ) { - alt15=2; - } - else if ( ((LA15_0>='\u0000' && LA15_0<='&')||(LA15_0>='(' && LA15_0<='\uFFFE')) ) { + if ( ((LA15_0>='\u0000' && LA15_0<='\t')||(LA15_0>='\u000B' && LA15_0<='\f')||(LA15_0>='\u000E' && LA15_0<='\uFFFF')) ) { alt15=1; } switch (alt15) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) + // ACG_ANTLR3.g:1261:12: ~ ( '\\r' | '\\n' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) - int alt14=3; - int LA14_0 = input.LA(1); + if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { + input.consume(); - if ( (LA14_0=='\\') ) { - alt14=1; - } - else if ( (LA14_0=='\n') ) { - alt14=2; - } - else if ( ((LA14_0>='\u0000' && LA14_0<='\t')||(LA14_0>='\u000B' && LA14_0<='[')||(LA14_0>=']' && LA14_0<='\uFFFE')) ) { - alt14=3; } else { - NoViableAltException nvae = - new NoViableAltException("1229:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) )", 14, 0, input); - - throw nvae; - } - switch (alt14) { - case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:41: ( '\\\\' ~ '\\n' ) - { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:41: ( '\\\\' ~ '\\n' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:42: '\\\\' ~ '\\n' - { - match('\\'); - if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\uFFFE') ) { - input.consume(); - - } - else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } - - - } - - - } - break; - case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:57: '\\n' - { - match('\n'); - - } - break; - case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1229:63: ~ ( '\\\\' | '\\n' ) - { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { - input.consume(); - - } - else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } - - - } - break; - - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } @@ -2758,7 +3003,6 @@ public class ACG_ANTLR3Lexer extends Lexer { } } while (true); - match('\''); } @@ -2771,680 +3015,702 @@ public class ACG_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end STRING + // $ANTLR end "COMMENT" public void mTokens() throws RecognitionException { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:8: ( T42 | T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | T101 | T102 | NL | WS | NAME | INT | FLOAT | LSQUARE | RSQUARE | EXCL | COMA | LPAREN | RPAREN | LCURLY | RCURLY | SEMI | COLON | PIPE | SHARP | QMARK | COLONCOLON | POINT | RARROW | MINUS | STAR | SLASH | PLUS | EQ | GT | LT | GE | LE | NE | LARROW | COMMENT | STRING ) - int alt16=95; + // ACG_ANTLR3.g:1:8: ( T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | NL | WS | NAME | INT | FLOAT | STRING | LSQUARE | RSQUARE | EXCL | COMA | LPAREN | RPAREN | LCURLY | RCURLY | SEMI | COLON | PIPE | SHARP | QMARK | COLONCOLON | POINT | RARROW | MINUS | STAR | SLASH | PLUS | EQ | GT | LT | GE | LE | NE | LARROW | COMMENT ) + int alt16=98; alt16 = dfa16.predict(input); switch (alt16) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:10: T42 + // ACG_ANTLR3.g:1:10: T__42 { - mT42(); + mT__42(); } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:14: T43 + // ACG_ANTLR3.g:1:16: T__43 { - mT43(); + mT__43(); } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:18: T44 + // ACG_ANTLR3.g:1:22: T__44 { - mT44(); + mT__44(); } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:22: T45 + // ACG_ANTLR3.g:1:28: T__45 { - mT45(); + mT__45(); } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:26: T46 + // ACG_ANTLR3.g:1:34: T__46 { - mT46(); + mT__46(); } break; case 6 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:30: T47 + // ACG_ANTLR3.g:1:40: T__47 { - mT47(); + mT__47(); } break; case 7 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:34: T48 + // ACG_ANTLR3.g:1:46: T__48 { - mT48(); + mT__48(); } break; case 8 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:38: T49 + // ACG_ANTLR3.g:1:52: T__49 { - mT49(); + mT__49(); } break; case 9 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:42: T50 + // ACG_ANTLR3.g:1:58: T__50 { - mT50(); + mT__50(); } break; case 10 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:46: T51 + // ACG_ANTLR3.g:1:64: T__51 { - mT51(); + mT__51(); } break; case 11 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:50: T52 + // ACG_ANTLR3.g:1:70: T__52 { - mT52(); + mT__52(); } break; case 12 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:54: T53 + // ACG_ANTLR3.g:1:76: T__53 { - mT53(); + mT__53(); } break; case 13 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:58: T54 + // ACG_ANTLR3.g:1:82: T__54 { - mT54(); + mT__54(); } break; case 14 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:62: T55 + // ACG_ANTLR3.g:1:88: T__55 { - mT55(); + mT__55(); } break; case 15 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:66: T56 + // ACG_ANTLR3.g:1:94: T__56 { - mT56(); + mT__56(); } break; case 16 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:70: T57 + // ACG_ANTLR3.g:1:100: T__57 { - mT57(); + mT__57(); } break; case 17 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:74: T58 + // ACG_ANTLR3.g:1:106: T__58 { - mT58(); + mT__58(); } break; case 18 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:78: T59 + // ACG_ANTLR3.g:1:112: T__59 { - mT59(); + mT__59(); } break; case 19 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:82: T60 + // ACG_ANTLR3.g:1:118: T__60 { - mT60(); + mT__60(); } break; case 20 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:86: T61 + // ACG_ANTLR3.g:1:124: T__61 { - mT61(); + mT__61(); } break; case 21 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:90: T62 + // ACG_ANTLR3.g:1:130: T__62 { - mT62(); + mT__62(); } break; case 22 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:94: T63 + // ACG_ANTLR3.g:1:136: T__63 { - mT63(); + mT__63(); } break; case 23 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:98: T64 + // ACG_ANTLR3.g:1:142: T__64 { - mT64(); + mT__64(); } break; case 24 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:102: T65 + // ACG_ANTLR3.g:1:148: T__65 { - mT65(); + mT__65(); } break; case 25 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:106: T66 + // ACG_ANTLR3.g:1:154: T__66 { - mT66(); + mT__66(); } break; case 26 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:110: T67 + // ACG_ANTLR3.g:1:160: T__67 { - mT67(); + mT__67(); } break; case 27 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:114: T68 + // ACG_ANTLR3.g:1:166: T__68 { - mT68(); + mT__68(); } break; case 28 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:118: T69 + // ACG_ANTLR3.g:1:172: T__69 { - mT69(); + mT__69(); } break; case 29 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:122: T70 + // ACG_ANTLR3.g:1:178: T__70 { - mT70(); + mT__70(); } break; case 30 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:126: T71 + // ACG_ANTLR3.g:1:184: T__71 { - mT71(); + mT__71(); } break; case 31 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:130: T72 + // ACG_ANTLR3.g:1:190: T__72 { - mT72(); + mT__72(); } break; case 32 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:134: T73 + // ACG_ANTLR3.g:1:196: T__73 { - mT73(); + mT__73(); } break; case 33 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:138: T74 + // ACG_ANTLR3.g:1:202: T__74 { - mT74(); + mT__74(); } break; case 34 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:142: T75 + // ACG_ANTLR3.g:1:208: T__75 { - mT75(); + mT__75(); } break; case 35 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:146: T76 + // ACG_ANTLR3.g:1:214: T__76 { - mT76(); + mT__76(); } break; case 36 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:150: T77 + // ACG_ANTLR3.g:1:220: T__77 { - mT77(); + mT__77(); } break; case 37 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:154: T78 + // ACG_ANTLR3.g:1:226: T__78 { - mT78(); + mT__78(); } break; case 38 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:158: T79 + // ACG_ANTLR3.g:1:232: T__79 { - mT79(); + mT__79(); } break; case 39 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:162: T80 + // ACG_ANTLR3.g:1:238: T__80 { - mT80(); + mT__80(); } break; case 40 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:166: T81 + // ACG_ANTLR3.g:1:244: T__81 { - mT81(); + mT__81(); } break; case 41 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:170: T82 + // ACG_ANTLR3.g:1:250: T__82 { - mT82(); + mT__82(); } break; case 42 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:174: T83 + // ACG_ANTLR3.g:1:256: T__83 { - mT83(); + mT__83(); } break; case 43 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:178: T84 + // ACG_ANTLR3.g:1:262: T__84 { - mT84(); + mT__84(); } break; case 44 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:182: T85 + // ACG_ANTLR3.g:1:268: T__85 { - mT85(); + mT__85(); } break; case 45 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:186: T86 + // ACG_ANTLR3.g:1:274: T__86 { - mT86(); + mT__86(); } break; case 46 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:190: T87 + // ACG_ANTLR3.g:1:280: T__87 { - mT87(); + mT__87(); } break; case 47 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:194: T88 + // ACG_ANTLR3.g:1:286: T__88 { - mT88(); + mT__88(); } break; case 48 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:198: T89 + // ACG_ANTLR3.g:1:292: T__89 { - mT89(); + mT__89(); } break; case 49 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:202: T90 + // ACG_ANTLR3.g:1:298: T__90 { - mT90(); + mT__90(); } break; case 50 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:206: T91 + // ACG_ANTLR3.g:1:304: T__91 { - mT91(); + mT__91(); } break; case 51 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:210: T92 + // ACG_ANTLR3.g:1:310: T__92 { - mT92(); + mT__92(); } break; case 52 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:214: T93 + // ACG_ANTLR3.g:1:316: T__93 { - mT93(); + mT__93(); } break; case 53 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:218: T94 + // ACG_ANTLR3.g:1:322: T__94 { - mT94(); + mT__94(); } break; case 54 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:222: T95 + // ACG_ANTLR3.g:1:328: T__95 { - mT95(); + mT__95(); } break; case 55 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:226: T96 + // ACG_ANTLR3.g:1:334: T__96 { - mT96(); + mT__96(); } break; case 56 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:230: T97 + // ACG_ANTLR3.g:1:340: T__97 { - mT97(); + mT__97(); } break; case 57 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:234: T98 + // ACG_ANTLR3.g:1:346: T__98 { - mT98(); + mT__98(); } break; case 58 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:238: T99 + // ACG_ANTLR3.g:1:352: T__99 { - mT99(); + mT__99(); } break; case 59 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:242: T100 + // ACG_ANTLR3.g:1:358: T__100 { - mT100(); + mT__100(); } break; case 60 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:247: T101 + // ACG_ANTLR3.g:1:365: T__101 { - mT101(); + mT__101(); } break; case 61 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:252: T102 + // ACG_ANTLR3.g:1:372: T__102 { - mT102(); + mT__102(); } break; case 62 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:257: NL + // ACG_ANTLR3.g:1:379: T__103 { - mNL(); + mT__103(); } break; case 63 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:260: WS + // ACG_ANTLR3.g:1:386: T__104 { - mWS(); + mT__104(); } break; case 64 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:263: NAME + // ACG_ANTLR3.g:1:393: T__105 { - mNAME(); + mT__105(); } break; case 65 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:268: INT + // ACG_ANTLR3.g:1:400: NL { - mINT(); + mNL(); } break; case 66 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:272: FLOAT + // ACG_ANTLR3.g:1:403: WS { - mFLOAT(); + mWS(); } break; case 67 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:278: LSQUARE + // ACG_ANTLR3.g:1:406: NAME { - mLSQUARE(); + mNAME(); } break; case 68 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:286: RSQUARE + // ACG_ANTLR3.g:1:411: INT { - mRSQUARE(); + mINT(); } break; case 69 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:294: EXCL + // ACG_ANTLR3.g:1:415: FLOAT { - mEXCL(); + mFLOAT(); } break; case 70 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:299: COMA + // ACG_ANTLR3.g:1:421: STRING { - mCOMA(); + mSTRING(); } break; case 71 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:304: LPAREN + // ACG_ANTLR3.g:1:428: LSQUARE { - mLPAREN(); + mLSQUARE(); } break; case 72 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:311: RPAREN + // ACG_ANTLR3.g:1:436: RSQUARE { - mRPAREN(); + mRSQUARE(); } break; case 73 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:318: LCURLY + // ACG_ANTLR3.g:1:444: EXCL { - mLCURLY(); + mEXCL(); } break; case 74 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:325: RCURLY + // ACG_ANTLR3.g:1:449: COMA { - mRCURLY(); + mCOMA(); } break; case 75 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:332: SEMI + // ACG_ANTLR3.g:1:454: LPAREN { - mSEMI(); + mLPAREN(); } break; case 76 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:337: COLON + // ACG_ANTLR3.g:1:461: RPAREN { - mCOLON(); + mRPAREN(); } break; case 77 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:343: PIPE + // ACG_ANTLR3.g:1:468: LCURLY { - mPIPE(); + mLCURLY(); } break; case 78 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:348: SHARP + // ACG_ANTLR3.g:1:475: RCURLY { - mSHARP(); + mRCURLY(); } break; case 79 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:354: QMARK + // ACG_ANTLR3.g:1:482: SEMI { - mQMARK(); + mSEMI(); } break; case 80 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:360: COLONCOLON + // ACG_ANTLR3.g:1:487: COLON { - mCOLONCOLON(); + mCOLON(); } break; case 81 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:371: POINT + // ACG_ANTLR3.g:1:493: PIPE { - mPOINT(); + mPIPE(); } break; case 82 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:377: RARROW + // ACG_ANTLR3.g:1:498: SHARP { - mRARROW(); + mSHARP(); } break; case 83 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:384: MINUS + // ACG_ANTLR3.g:1:504: QMARK { - mMINUS(); + mQMARK(); } break; case 84 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:390: STAR + // ACG_ANTLR3.g:1:510: COLONCOLON { - mSTAR(); + mCOLONCOLON(); } break; case 85 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:395: SLASH + // ACG_ANTLR3.g:1:521: POINT { - mSLASH(); + mPOINT(); } break; case 86 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:401: PLUS + // ACG_ANTLR3.g:1:527: RARROW { - mPLUS(); + mRARROW(); } break; case 87 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:406: EQ + // ACG_ANTLR3.g:1:534: MINUS { - mEQ(); + mMINUS(); } break; case 88 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:409: GT + // ACG_ANTLR3.g:1:540: STAR { - mGT(); + mSTAR(); } break; case 89 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:412: LT + // ACG_ANTLR3.g:1:545: SLASH { - mLT(); + mSLASH(); } break; case 90 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:415: GE + // ACG_ANTLR3.g:1:551: PLUS { - mGE(); + mPLUS(); } break; case 91 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:418: LE + // ACG_ANTLR3.g:1:556: EQ { - mLE(); + mEQ(); } break; case 92 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:421: NE + // ACG_ANTLR3.g:1:559: GT { - mNE(); + mGT(); } break; case 93 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:424: LARROW + // ACG_ANTLR3.g:1:562: LT { - mLARROW(); + mLT(); } break; case 94 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:431: COMMENT + // ACG_ANTLR3.g:1:565: GE { - mCOMMENT(); + mGE(); } break; case 95 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:1:439: STRING + // ACG_ANTLR3.g:1:568: LE { - mSTRING(); + mLE(); + + } + break; + case 96 : + // ACG_ANTLR3.g:1:571: NE + { + mNE(); + + } + break; + case 97 : + // ACG_ANTLR3.g:1:574: LARROW + { + mLARROW(); + + } + break; + case 98 : + // ACG_ANTLR3.g:1:581: COMMENT + { + mCOMMENT(); } break; @@ -3456,105 +3722,109 @@ public class ACG_ANTLR3Lexer extends Lexer { protected DFA16 dfa16 = new DFA16(this); static final String DFA16_eotS = - "\1\uffff\24\27\3\uffff\1\136\11\uffff\1\141\4\uffff\1\144\4\uffff"+ - "\1\146\1\152\1\uffff\23\27\1\u0083\1\u0084\5\27\1\u008a\24\27\15"+ - "\uffff\1\u009f\1\27\1\u00a1\1\u00a2\5\27\1\u00a8\7\27\1\u00b0\1"+ - "\u00b1\4\27\1\u00b7\2\uffff\2\27\1\u00ba\2\27\1\uffff\3\27\1\u00c0"+ - "\4\27\1\u00c5\2\27\1\u00c9\1\u00ca\1\u00cc\5\27\1\u00d2\1\uffff"+ - "\1\27\2\uffff\3\27\1\u00d7\1\27\1\uffff\1\u00d9\5\27\1\u00e0\2\uffff"+ - "\1\u00e1\2\27\1\u00e4\1\u00e5\1\uffff\2\27\1\uffff\2\27\1\u00ea"+ - "\2\27\1\uffff\1\u00ee\1\u00ef\2\27\1\uffff\1\27\1\u00f7\1\27\2\uffff"+ - "\1\27\1\uffff\1\u00fa\1\u00fb\1\u00fc\2\27\1\uffff\2\27\1\u0101"+ - "\1\27\1\uffff\1\27\1\uffff\2\27\1\u0106\1\27\1\u0108\1\u0109\2\uffff"+ - "\2\27\2\uffff\4\27\1\uffff\1\27\1\u0111\1\u0112\2\uffff\2\27\1\u0115"+ - "\1\u0116\1\u0117\1\u0118\1\u0119\1\uffff\2\27\3\uffff\4\27\1\uffff"+ - "\4\27\1\uffff\1\u0124\2\uffff\1\27\1\u0126\5\27\2\uffff\1\u012c"+ - "\1\27\5\uffff\1\u012e\1\u012f\3\27\1\u0133\3\27\1\u0137\1\uffff"+ - "\1\u0138\1\uffff\1\u0139\1\u013a\3\27\1\uffff\1\u013e\2\uffff\3"+ - "\27\1\uffff\2\27\1\u0144\4\uffff\1\u0145\2\27\1\uffff\1\27\1\u0149"+ - "\1\u014a\1\27\1\u014c\2\uffff\1\u014d\2\27\2\uffff\1\u0150\2\uffff"+ - "\1\u0151\1\27\2\uffff\1\27\1\u0154\1\uffff"; + "\1\uffff\24\27\3\uffff\1\140\12\uffff\1\143\4\uffff\1\146\4\uffff"+ + "\1\150\1\154\23\27\1\u0085\1\u0086\5\27\1\u008c\26\27\15\uffff\1"+ + "\u00a3\1\27\1\u00a5\1\27\1\u00a7\4\27\1\u00ac\7\27\1\u00b5\1\u00b6"+ + "\4\27\1\u00bc\2\uffff\1\27\1\u00be\3\27\1\uffff\3\27\1\u00c5\5\27"+ + "\1\u00cb\3\27\1\u00d0\1\u00d1\1\u00d3\5\27\1\u00d9\1\uffff\1\27"+ + "\1\uffff\1\27\1\uffff\2\27\1\u00de\1\27\1\uffff\1\u00e0\5\27\1\u00e7"+ + "\1\27\2\uffff\1\u00e9\2\27\1\u00ec\1\u00ed\1\uffff\1\27\1\uffff"+ + "\3\27\1\u00f2\2\27\1\uffff\1\u00f6\1\u00f7\3\27\1\uffff\1\u00ff"+ + "\3\27\2\uffff\1\27\1\uffff\1\u0104\1\u0105\1\u0106\2\27\1\uffff"+ + "\3\27\1\u010c\1\uffff\1\27\1\uffff\2\27\1\u0110\1\27\1\u0112\1\u0113"+ + "\1\uffff\1\u0114\1\uffff\2\27\2\uffff\4\27\1\uffff\1\u011b\1\27"+ + "\1\u011d\2\uffff\2\27\1\u0120\1\u0121\1\u0122\1\u0123\1\u0124\1"+ + "\uffff\1\u0125\3\27\3\uffff\5\27\1\uffff\3\27\1\uffff\1\u0131\3"+ + "\uffff\1\27\1\u0133\4\27\1\uffff\1\27\1\uffff\1\u0139\1\27\6\uffff"+ + "\1\u013b\1\u013c\1\u013d\3\27\1\u0141\3\27\1\u0145\1\uffff\1\u0146"+ + "\1\uffff\1\u0147\1\u0148\3\27\1\uffff\1\u014c\3\uffff\3\27\1\uffff"+ + "\2\27\1\u0152\4\uffff\1\u0153\2\27\1\uffff\1\27\1\u0157\1\u0158"+ + "\1\27\1\u015a\2\uffff\1\u015b\2\27\2\uffff\1\u015e\2\uffff\1\u015f"+ + "\1\27\2\uffff\1\27\1\u0162\1\uffff"; static final String DFA16_eofS = - "\u0155\uffff"; + "\u0163\uffff"; static final String DFA16_minS = "\1\11\1\143\1\145\3\141\1\157\1\146\1\141\1\160\1\154\1\141\1\145"+ - "\2\141\1\151\1\145\1\150\1\143\1\145\1\157\3\uffff\1\56\11\uffff"+ - "\1\72\4\uffff\1\55\4\uffff\1\75\1\55\1\uffff\1\147\1\164\1\155\3"+ - "\141\1\160\1\154\1\156\1\162\1\145\1\154\1\155\1\167\1\164\1\144"+ - "\1\151\1\154\1\144\2\60\1\145\1\160\1\141\1\162\1\145\1\60\1\163"+ - "\1\144\1\162\1\164\1\141\1\163\1\160\1\162\1\160\1\162\1\163\1\160"+ - "\1\166\2\164\1\165\1\145\1\154\1\161\1\162\15\uffff\1\60\1\162\2"+ - "\60\1\154\2\162\1\160\1\145\1\60\1\146\1\143\1\145\1\154\1\144\1"+ - "\163\1\145\2\60\1\145\2\164\1\154\1\60\2\uffff\1\162\1\154\1\60"+ - "\1\151\1\162\1\uffff\1\145\1\151\1\157\1\60\1\144\1\164\1\157\1"+ - "\156\1\60\1\141\1\150\3\60\1\157\1\145\1\156\1\125\1\165\1\60\1"+ - "\uffff\1\151\2\uffff\1\171\1\145\1\164\1\60\1\162\1\uffff\1\60\1"+ - "\164\1\141\1\144\1\155\1\145\1\60\2\uffff\1\60\1\145\1\151\2\60"+ - "\1\uffff\1\141\1\151\1\uffff\2\141\1\60\1\146\1\162\1\uffff\2\60"+ - "\1\162\1\151\1\uffff\1\155\1\60\1\170\2\uffff\1\163\1\uffff\3\60"+ - "\1\156\1\145\1\uffff\1\142\1\172\1\60\1\163\1\uffff\1\143\1\uffff"+ - "\1\151\1\143\1\60\1\145\2\60\2\uffff\1\170\1\143\2\uffff\1\164\1"+ - "\145\1\142\1\164\1\uffff\1\145\2\60\2\uffff\1\164\1\156\5\60\1\uffff"+ - "\1\61\1\155\3\uffff\1\144\1\156\1\165\1\145\1\uffff\1\127\1\141"+ - "\1\157\1\150\1\uffff\1\60\2\uffff\1\164\1\60\1\145\1\163\1\154\1"+ - "\151\1\162\2\uffff\1\60\1\147\5\uffff\2\60\1\145\1\143\1\164\1\60"+ - "\1\151\1\154\1\156\1\60\1\uffff\1\60\1\uffff\2\60\1\145\1\157\1"+ - "\141\1\uffff\1\60\2\uffff\1\146\2\145\1\uffff\1\164\1\154\1\60\4"+ - "\uffff\1\60\1\156\1\164\1\uffff\1\151\2\60\1\150\1\60\2\uffff\1"+ - "\60\1\145\1\156\2\uffff\1\60\2\uffff\1\60\1\145\2\uffff\1\144\1"+ - "\60\1\uffff"; + "\2\141\2\145\1\150\1\143\1\145\1\157\3\uffff\1\56\12\uffff\1\72"+ + "\4\uffff\1\55\4\uffff\1\75\1\55\1\147\1\164\1\155\3\141\1\160\1"+ + "\154\1\156\1\162\1\145\1\154\1\155\1\167\1\164\1\144\1\151\1\154"+ + "\1\144\2\60\1\145\1\141\1\160\1\162\1\145\1\60\1\163\1\162\1\144"+ + "\1\164\1\141\1\163\1\160\2\162\1\160\1\163\1\141\1\154\1\160\1\166"+ + "\2\164\1\145\1\165\1\154\1\161\1\162\15\uffff\1\60\1\162\1\60\1"+ + "\154\1\60\2\162\1\160\1\145\1\60\1\146\1\143\1\145\1\154\1\144\1"+ + "\163\1\145\2\60\1\145\2\164\1\154\1\60\2\uffff\1\162\1\60\1\154"+ + "\1\151\1\162\1\uffff\1\145\1\157\1\151\1\60\1\144\1\164\1\157\1"+ + "\156\1\141\1\60\1\150\1\154\1\145\3\60\1\157\1\156\1\145\1\125\1"+ + "\165\1\60\1\uffff\1\151\1\uffff\1\171\1\uffff\1\164\1\145\1\60\1"+ + "\162\1\uffff\1\60\1\164\1\141\1\144\1\155\1\145\1\60\1\156\2\uffff"+ + "\1\60\1\145\1\151\2\60\1\uffff\1\141\1\uffff\1\151\2\141\1\60\1"+ + "\162\1\146\1\uffff\2\60\1\162\1\151\1\155\1\uffff\1\60\1\154\1\164"+ + "\1\170\2\uffff\1\163\1\uffff\3\60\1\156\1\145\1\uffff\1\142\1\172"+ + "\1\163\1\60\1\uffff\1\143\1\uffff\1\151\1\143\1\60\1\145\2\60\1"+ + "\uffff\1\60\1\uffff\1\170\1\143\2\uffff\1\164\1\145\1\142\1\164"+ + "\1\uffff\1\60\1\145\1\60\2\uffff\1\164\1\156\5\60\1\uffff\1\60\1"+ + "\145\1\61\1\155\3\uffff\1\144\1\156\1\165\1\145\1\127\1\uffff\1"+ + "\141\1\157\1\150\1\uffff\1\60\3\uffff\1\164\1\60\1\145\1\163\1\154"+ + "\1\151\1\uffff\1\162\1\uffff\1\60\1\147\6\uffff\3\60\1\145\1\143"+ + "\1\164\1\60\1\151\1\154\1\156\1\60\1\uffff\1\60\1\uffff\2\60\1\145"+ + "\1\157\1\141\1\uffff\1\60\3\uffff\1\146\2\145\1\uffff\1\164\1\154"+ + "\1\60\4\uffff\1\60\1\156\1\164\1\uffff\1\151\2\60\1\150\1\60\2\uffff"+ + "\1\60\1\145\1\156\2\uffff\1\60\2\uffff\1\60\1\145\2\uffff\1\144"+ + "\1\60\1\uffff"; static final String DFA16_maxS = "\1\u00ff\1\164\1\167\1\165\1\157\1\162\1\157\1\164\1\141\2\162\1"+ "\157\1\145\1\141\2\165\1\157\1\162\1\143\1\145\1\157\3\uffff\1\71"+ - "\11\uffff\1\72\4\uffff\1\76\4\uffff\1\75\1\76\1\uffff\1\147\1\164"+ - "\1\155\1\144\1\157\1\141\1\160\1\164\1\156\1\162\1\156\1\154\1\155"+ - "\1\167\1\164\1\156\1\151\1\154\1\144\2\u00ff\1\145\1\160\1\141\1"+ - "\162\1\145\1\u00ff\1\163\1\144\1\162\1\164\1\141\1\163\1\160\1\162"+ - "\1\160\1\162\1\163\1\160\1\166\2\164\1\165\1\145\1\154\1\161\1\162"+ - "\15\uffff\1\u00ff\1\162\2\u00ff\1\154\2\162\1\160\1\145\1\u00ff"+ - "\1\146\1\143\1\145\1\154\1\144\1\163\1\145\2\u00ff\1\145\2\164\1"+ - "\154\1\u00ff\2\uffff\1\162\1\154\1\u00ff\1\151\1\162\1\uffff\1\145"+ - "\1\151\1\157\1\u00ff\1\144\1\164\1\157\1\156\1\u00ff\1\141\1\150"+ - "\3\u00ff\1\157\1\145\1\156\1\125\1\165\1\u00ff\1\uffff\1\151\2\uffff"+ - "\1\171\1\145\1\164\1\u00ff\1\162\1\uffff\1\u00ff\1\164\1\141\1\144"+ - "\1\155\1\145\1\u00ff\2\uffff\1\u00ff\1\145\1\151\2\u00ff\1\uffff"+ - "\1\141\1\151\1\uffff\2\141\1\u00ff\1\164\1\162\1\uffff\2\u00ff\1"+ - "\162\1\151\1\uffff\1\155\1\u00ff\1\170\2\uffff\1\163\1\uffff\3\u00ff"+ - "\1\156\1\145\1\uffff\1\142\1\172\1\u00ff\1\163\1\uffff\1\143\1\uffff"+ - "\1\151\1\143\1\u00ff\1\145\2\u00ff\2\uffff\1\170\1\143\2\uffff\1"+ - "\164\1\145\1\142\1\164\1\uffff\1\145\2\u00ff\2\uffff\1\164\1\156"+ - "\5\u00ff\1\uffff\1\61\1\155\3\uffff\1\144\1\156\1\165\1\145\1\uffff"+ - "\1\127\1\141\1\157\1\150\1\uffff\1\u00ff\2\uffff\1\164\1\u00ff\1"+ - "\145\1\163\1\154\1\151\1\162\2\uffff\1\u00ff\1\147\5\uffff\2\u00ff"+ - "\1\145\1\143\1\164\1\u00ff\1\151\1\154\1\156\1\u00ff\1\uffff\1\u00ff"+ - "\1\uffff\2\u00ff\1\145\1\157\1\141\1\uffff\1\u00ff\2\uffff\1\146"+ - "\2\145\1\uffff\1\164\1\154\1\u00ff\4\uffff\1\u00ff\1\156\1\164\1"+ - "\uffff\1\151\2\u00ff\1\150\1\u00ff\2\uffff\1\u00ff\1\145\1\156\2"+ - "\uffff\1\u00ff\2\uffff\1\u00ff\1\145\2\uffff\1\144\1\u00ff\1\uffff"; + "\12\uffff\1\72\4\uffff\1\76\4\uffff\1\75\1\76\1\147\1\164\1\155"+ + "\1\144\1\157\1\141\1\160\1\164\1\156\1\162\1\156\1\154\1\155\1\167"+ + "\1\164\1\156\1\151\1\154\1\144\2\u00ff\1\145\1\141\1\160\1\162\1"+ + "\145\1\u00ff\1\163\1\162\1\144\1\164\1\141\1\163\1\160\2\162\1\160"+ + "\1\163\1\141\1\154\1\160\1\166\2\164\1\145\1\165\1\154\1\161\1\162"+ + "\15\uffff\1\u00ff\1\162\1\u00ff\1\154\1\u00ff\2\162\1\160\1\145"+ + "\1\u00ff\1\146\1\143\1\145\1\154\1\144\1\163\1\145\2\u00ff\1\145"+ + "\2\164\1\154\1\u00ff\2\uffff\1\162\1\u00ff\1\154\1\151\1\162\1\uffff"+ + "\1\145\1\157\1\151\1\u00ff\1\144\1\164\1\157\1\156\1\141\1\u00ff"+ + "\1\150\1\154\1\145\3\u00ff\1\157\1\156\1\145\1\125\1\165\1\u00ff"+ + "\1\uffff\1\151\1\uffff\1\171\1\uffff\1\164\1\145\1\u00ff\1\162\1"+ + "\uffff\1\u00ff\1\164\1\141\1\144\1\155\1\145\1\u00ff\1\156\2\uffff"+ + "\1\u00ff\1\145\1\151\2\u00ff\1\uffff\1\141\1\uffff\1\151\2\141\1"+ + "\u00ff\1\162\1\164\1\uffff\2\u00ff\1\162\1\151\1\155\1\uffff\1\u00ff"+ + "\1\154\1\164\1\170\2\uffff\1\163\1\uffff\3\u00ff\1\156\1\145\1\uffff"+ + "\1\142\1\172\1\163\1\u00ff\1\uffff\1\143\1\uffff\1\151\1\143\1\u00ff"+ + "\1\145\2\u00ff\1\uffff\1\u00ff\1\uffff\1\170\1\143\2\uffff\1\164"+ + "\1\145\1\142\1\164\1\uffff\1\u00ff\1\145\1\u00ff\2\uffff\1\164\1"+ + "\156\5\u00ff\1\uffff\1\u00ff\1\145\1\61\1\155\3\uffff\1\144\1\156"+ + "\1\165\1\145\1\127\1\uffff\1\141\1\157\1\150\1\uffff\1\u00ff\3\uffff"+ + "\1\164\1\u00ff\1\145\1\163\1\154\1\151\1\uffff\1\162\1\uffff\1\u00ff"+ + "\1\147\6\uffff\3\u00ff\1\145\1\143\1\164\1\u00ff\1\151\1\154\1\156"+ + "\1\u00ff\1\uffff\1\u00ff\1\uffff\2\u00ff\1\145\1\157\1\141\1\uffff"+ + "\1\u00ff\3\uffff\1\146\2\145\1\uffff\1\164\1\154\1\u00ff\4\uffff"+ + "\1\u00ff\1\156\1\164\1\uffff\1\151\2\u00ff\1\150\1\u00ff\2\uffff"+ + "\1\u00ff\1\145\1\156\2\uffff\1\u00ff\2\uffff\1\u00ff\1\145\2\uffff"+ + "\1\144\1\u00ff\1\uffff"; static final String DFA16_acceptS = - "\25\uffff\1\76\1\77\1\100\1\uffff\1\103\1\104\1\105\1\106\1\107"+ - "\1\110\1\111\1\112\1\113\1\uffff\1\115\1\116\1\117\1\121\1\uffff"+ - "\1\124\1\125\1\126\1\127\2\uffff\1\137\57\uffff\1\101\1\102\1\120"+ - "\1\114\1\136\1\122\1\123\1\132\1\130\1\134\1\135\1\133\1\131\30"+ - "\uffff\1\17\1\12\5\uffff\1\73\24\uffff\1\1\1\uffff\1\5\1\72\5\uffff"+ - "\1\54\7\uffff\1\31\1\66\5\uffff\1\70\2\uffff\1\71\5\uffff\1\21\4"+ - "\uffff\1\34\3\uffff\1\32\1\67\1\uffff\1\53\5\uffff\1\74\4\uffff"+ - "\1\35\1\uffff\1\56\6\uffff\1\6\1\7\2\uffff\1\51\1\10\4\uffff\1\20"+ - "\3\uffff\1\47\1\57\7\uffff\1\44\2\uffff\1\55\1\64\1\60\4\uffff\1"+ - "\50\4\uffff\1\27\1\uffff\1\65\1\14\7\uffff\1\61\1\25\2\uffff\1\30"+ - "\1\43\1\45\1\42\1\46\12\uffff\1\41\1\uffff\1\24\5\uffff\1\23\1\uffff"+ - "\1\33\1\40\3\uffff\1\22\3\uffff\1\11\1\16\1\36\1\75\3\uffff\1\26"+ - "\5\uffff\1\3\1\13\3\uffff\1\63\1\4\1\uffff\1\52\1\15\2\uffff\1\2"+ - "\1\37\2\uffff\1\62"; + "\25\uffff\1\101\1\102\1\103\1\uffff\1\106\1\107\1\110\1\111\1\112"+ + "\1\113\1\114\1\115\1\116\1\117\1\uffff\1\121\1\122\1\123\1\125\1"+ + "\uffff\1\130\1\131\1\132\1\133\63\uffff\1\104\1\105\1\124\1\120"+ + "\1\126\1\142\1\127\1\136\1\134\1\137\1\140\1\141\1\135\30\uffff"+ + "\1\12\1\17\5\uffff\1\76\26\uffff\1\1\1\uffff\1\5\1\uffff\1\75\4"+ + "\uffff\1\57\10\uffff\1\31\1\71\5\uffff\1\73\1\uffff\1\74\6\uffff"+ + "\1\21\5\uffff\1\36\4\uffff\1\34\1\72\1\uffff\1\56\5\uffff\1\77\4"+ + "\uffff\1\37\1\uffff\1\61\6\uffff\1\6\1\uffff\1\7\2\uffff\1\53\1"+ + "\10\4\uffff\1\20\3\uffff\1\51\1\62\7\uffff\1\46\4\uffff\1\60\1\63"+ + "\1\67\5\uffff\1\52\3\uffff\1\27\1\uffff\1\70\1\14\1\32\6\uffff\1"+ + "\25\1\uffff\1\64\2\uffff\1\30\1\44\1\45\1\47\1\50\1\54\13\uffff"+ + "\1\43\1\uffff\1\24\5\uffff\1\23\1\uffff\1\33\1\35\1\42\3\uffff\1"+ + "\22\3\uffff\1\11\1\16\1\40\1\100\3\uffff\1\26\5\uffff\1\3\1\13\3"+ + "\uffff\1\66\1\4\1\uffff\1\55\1\15\2\uffff\1\2\1\41\2\uffff\1\65"; static final String DFA16_specialS = - "\u0155\uffff}>"; + "\u0163\uffff}>"; static final String[] DFA16_transitionS = { - "\1\26\1\25\2\uffff\1\25\22\uffff\1\26\1\33\1\27\1\44\3\uffff"+ - "\1\56\1\35\1\36\1\50\1\52\1\34\1\47\1\46\1\51\12\30\1\42\1\41"+ - "\1\55\1\53\1\54\1\45\1\uffff\16\27\1\22\3\27\1\23\7\27\1\31"+ - "\1\uffff\1\32\1\uffff\1\27\1\uffff\1\1\1\27\1\5\1\17\1\12\1"+ + "\1\26\1\25\2\uffff\1\25\22\uffff\1\26\1\34\1\27\1\45\3\uffff"+ + "\1\31\1\36\1\37\1\51\1\53\1\35\1\50\1\47\1\52\12\30\1\43\1\42"+ + "\1\56\1\54\1\55\1\46\1\uffff\16\27\1\22\3\27\1\23\7\27\1\32"+ + "\1\uffff\1\33\1\uffff\1\27\1\uffff\1\1\1\27\1\5\1\17\1\12\1"+ "\3\1\20\1\27\1\7\2\27\1\13\1\6\1\4\1\11\1\16\1\27\1\14\1\2\1"+ - "\21\1\27\1\10\1\15\1\24\2\27\1\37\1\43\1\40\102\uffff\27\27"+ + "\21\1\27\1\10\1\15\1\24\2\27\1\40\1\44\1\41\102\uffff\27\27"+ "\1\uffff\37\27\1\uffff\10\27", "\1\57\12\uffff\1\62\4\uffff\1\61\1\60", "\1\66\16\uffff\1\63\1\65\1\uffff\1\64", @@ -3562,24 +3832,24 @@ public class ACG_ANTLR3Lexer extends Lexer { "\1\73\3\uffff\1\74\11\uffff\1\75", "\1\100\15\uffff\1\76\2\uffff\1\77", "\1\101", - "\1\102\6\uffff\1\105\1\103\4\uffff\1\106\1\104", + "\1\103\6\uffff\1\106\1\102\4\uffff\1\105\1\104", "\1\107", "\1\110\1\uffff\1\111", - "\1\112\1\uffff\1\113\3\uffff\1\114", + "\1\112\1\uffff\1\114\3\uffff\1\113", "\1\117\3\uffff\1\115\11\uffff\1\116", "\1\120", "\1\121", - "\1\123\15\uffff\1\122\5\uffff\1\124", - "\1\126\13\uffff\1\125", - "\1\127\11\uffff\1\130", - "\1\132\11\uffff\1\131", - "\1\133", - "\1\134", + "\1\122\1\uffff\1\125\13\uffff\1\123\5\uffff\1\124", + "\1\126\3\uffff\1\130\13\uffff\1\127", + "\1\131\11\uffff\1\132", + "\1\133\11\uffff\1\134", "\1\135", + "\1\136", + "\1\137", "", "", "", - "\1\137\1\uffff\12\30", + "\1\141\1\uffff\12\30", "", "", "", @@ -3589,51 +3859,49 @@ public class ACG_ANTLR3Lexer extends Lexer { "", "", "", - "\1\140", "", + "\1\142", "", "", "", - "\1\142\20\uffff\1\143", "", + "\1\145\20\uffff\1\144", "", "", "", - "\1\145", - "\1\150\17\uffff\1\151\1\147", "", - "\1\153", - "\1\154", + "\1\147", + "\1\153\17\uffff\1\151\1\152", "\1\155", - "\1\157\2\uffff\1\156", - "\1\161\15\uffff\1\160", - "\1\162", - "\1\163", - "\1\165\7\uffff\1\164", - "\1\166", - "\1\167", - "\1\170\10\uffff\1\171", - "\1\172", - "\1\173", + "\1\156", + "\1\157", + "\1\160\2\uffff\1\161", + "\1\162\15\uffff\1\163", + "\1\164", + "\1\165", + "\1\167\7\uffff\1\166", + "\1\170", + "\1\171", + "\1\172\10\uffff\1\173", "\1\174", "\1\175", - "\1\176\11\uffff\1\177", - "\1\u0080", - "\1\u0081", + "\1\176", + "\1\177", + "\1\u0080\11\uffff\1\u0081", "\1\u0082", + "\1\u0083", + "\1\u0084", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u0085", - "\1\u0086", "\1\u0087", "\1\u0088", "\1\u0089", + "\1\u008a", + "\1\u008b", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u008b", - "\1\u008c", "\1\u008d", "\1\u008e", "\1\u008f", @@ -3652,6 +3920,10 @@ public class ACG_ANTLR3Lexer extends Lexer { "\1\u009c", "\1\u009d", "\1\u009e", + "\1\u009f", + "\1\u00a0", + "\1\u00a1", + "\1\u00a2", "", "", "", @@ -3667,50 +3939,44 @@ public class ACG_ANTLR3Lexer extends Lexer { "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u00a0", - "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ - "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00a4", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u00a3", - "\1\u00a4", - "\1\u00a5", "\1\u00a6", - "\1\u00a7", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00a8", "\1\u00a9", "\1\u00aa", "\1\u00ab", - "\1\u00ac", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ + "\27\1\uffff\37\27\1\uffff\10\27", "\1\u00ad", "\1\u00ae", "\1\u00af", - "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ - "\27\1\uffff\37\27\1\uffff\10\27", - "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ - "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00b0", + "\1\u00b1", "\1\u00b2", "\1\u00b3", - "\1\u00b4", - "\1\u00b5", - "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\4\27\1\u00b6\25\27"+ - "\105\uffff\27\27\1\uffff\37\27\1\uffff\10\27", - "", - "", - "\1\u00b8", - "\1\u00b9", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\10\27\1\u00b4\21"+ + "\27\105\uffff\27\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u00bb", - "\1\u00bc", + "\1\u00b7", + "\1\u00b8", + "\1\u00b9", + "\1\u00ba", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\4\27\1\u00bb\25\27"+ + "\105\uffff\27\27\1\uffff\37\27\1\uffff\10\27", + "", "", "\1\u00bd", - "\1\u00be", - "\1\u00bf", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00bf", + "\1\u00c0", "\1\u00c1", + "", "\1\u00c2", "\1\u00c3", "\1\u00c4", @@ -3718,75 +3984,86 @@ public class ACG_ANTLR3Lexer extends Lexer { "\27\1\uffff\37\27\1\uffff\10\27", "\1\u00c6", "\1\u00c7", - "\12\27\7\uffff\32\27\4\uffff\1\u00c8\1\uffff\32\27\105\uffff"+ - "\27\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00c8", + "\1\u00c9", + "\1\u00ca", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\1\u00cb\31\27\105"+ - "\uffff\27\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00cc", "\1\u00cd", "\1\u00ce", - "\1\u00cf", - "\1\u00d0", - "\1\u00d1", + "\12\27\7\uffff\32\27\4\uffff\1\u00cf\1\uffff\32\27\105\uffff"+ + "\27\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "", - "\1\u00d3", - "", - "", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\1\u00d2\31\27\105"+ + "\uffff\27\27\1\uffff\37\27\1\uffff\10\27", "\1\u00d4", "\1\u00d5", "\1\u00d6", - "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ - "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00d7", "\1\u00d8", - "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", + "", "\1\u00da", + "", "\1\u00db", + "", "\1\u00dc", "\1\u00dd", - "\1\u00de", - "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\3\27\1\u00df\26\27"+ - "\105\uffff\27\27\1\uffff\37\27\1\uffff\10\27", - "", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ + "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00df", "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00e1", "\1\u00e2", "\1\u00e3", + "\1\u00e4", + "\1\u00e5", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\3\27\1\u00e6\26\27"+ + "\105\uffff\27\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00e8", + "", + "", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ + "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u00ea", + "\1\u00eb", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "", - "\1\u00e6", - "\1\u00e7", + "\1\u00ee", "", - "\1\u00e8", - "\1\u00e9", + "\1\u00ef", + "\1\u00f0", + "\1\u00f1", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u00ec\15\uffff\1\u00eb", - "\1\u00ed", + "\1\u00f3", + "\1\u00f5\15\uffff\1\u00f4", "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u00f0", - "\1\u00f1", + "\1\u00f8", + "\1\u00f9", + "\1\u00fa", "", - "\1\u00f2", - "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\3\27\1\u00f6\1\27"+ - "\1\u00f3\2\27\1\u00f4\12\27\1\u00f5\6\27\105\uffff\27\27\1\uffff"+ + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\3\27\1\u00fe\1\27"+ + "\1\u00fc\2\27\1\u00fd\12\27\1\u00fb\6\27\105\uffff\27\27\1\uffff"+ "\37\27\1\uffff\10\27", - "\1\u00f8", + "\1\u0100", + "\1\u0101", + "\1\u0102", "", "", - "\1\u00f9", + "\1\u0103", "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", @@ -3794,46 +4071,48 @@ public class ACG_ANTLR3Lexer extends Lexer { "\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u00fd", - "\1\u00fe", + "\1\u0107", + "\1\u0108", "", - "\1\u00ff", - "\1\u0100", + "\1\u0109", + "\1\u010a", + "\1\u010b", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u0102", "", - "\1\u0103", + "\1\u010d", "", - "\1\u0104", - "\1\u0105", + "\1\u010e", + "\1\u010f", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u0107", + "\1\u0111", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ + "\27\1\uffff\37\27\1\uffff\10\27", "", - "\1\u010a", - "\1\u010b", + "\1\u0115", + "\1\u0116", "", "", - "\1\u010c", - "\1\u010d", - "\1\u010e", - "\1\u010f", + "\1\u0117", + "\1\u0118", + "\1\u0119", + "\1\u011a", "", - "\1\u0110", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u011c", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "", "", - "\1\u0113", - "\1\u0114", + "\1\u011e", + "\1\u011f", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ @@ -3845,38 +4124,43 @@ public class ACG_ANTLR3Lexer extends Lexer { "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "", - "\1\u011a", - "\1\u011b", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ + "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u0126", + "\1\u0127", + "\1\u0128", "", "", "", - "\1\u011c", - "\1\u011d", - "\1\u011e", - "\1\u011f", + "\1\u0129", + "\1\u012a", + "\1\u012b", + "\1\u012c", + "\1\u012d", "", - "\1\u0120", - "\1\u0121", - "\1\u0122", - "\1\u0123", + "\1\u012e", + "\1\u012f", + "\1\u0130", "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "", "", - "\1\u0125", + "", + "\1\u0132", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u0127", - "\1\u0128", - "\1\u0129", - "\1\u012a", - "\1\u012b", + "\1\u0134", + "\1\u0135", + "\1\u0136", + "\1\u0137", "", + "\1\u0138", "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u012d", + "\1\u013a", + "", "", "", "", @@ -3886,14 +4170,16 @@ public class ACG_ANTLR3Lexer extends Lexer { "\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u0130", - "\1\u0131", - "\1\u0132", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u0134", - "\1\u0135", - "\1\u0136", + "\1\u013e", + "\1\u013f", + "\1\u0140", + "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ + "\27\1\uffff\37\27\1\uffff\10\27", + "\1\u0142", + "\1\u0143", + "\1\u0144", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "", @@ -3904,20 +4190,21 @@ public class ACG_ANTLR3Lexer extends Lexer { "\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u013b", - "\1\u013c", - "\1\u013d", + "\1\u0149", + "\1\u014a", + "\1\u014b", "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "", "", - "\1\u013f", - "\1\u0140", - "\1\u0141", "", - "\1\u0142", - "\1\u0143", + "\1\u014d", + "\1\u014e", + "\1\u014f", + "", + "\1\u0150", + "\1\u0151", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "", @@ -3926,23 +4213,23 @@ public class ACG_ANTLR3Lexer extends Lexer { "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u0146", - "\1\u0147", + "\1\u0154", + "\1\u0155", "", - "\1\u0148", + "\1\u0156", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u014b", + "\1\u0159", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "", "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u014e", - "\1\u014f", + "\1\u015c", + "\1\u015d", "", "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ @@ -3951,10 +4238,10 @@ public class ACG_ANTLR3Lexer extends Lexer { "", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", - "\1\u0152", + "\1\u0160", "", "", - "\1\u0153", + "\1\u0161", "\12\27\7\uffff\32\27\4\uffff\1\27\1\uffff\32\27\105\uffff\27"+ "\27\1\uffff\37\27\1\uffff\10\27", "" @@ -3990,7 +4277,7 @@ public class ACG_ANTLR3Lexer extends Lexer { this.transition = DFA16_transition; } public String getDescription() { - return "1:1: Tokens : ( T42 | T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | T101 | T102 | NL | WS | NAME | INT | FLOAT | LSQUARE | RSQUARE | EXCL | COMA | LPAREN | RPAREN | LCURLY | RCURLY | SEMI | COLON | PIPE | SHARP | QMARK | COLONCOLON | POINT | RARROW | MINUS | STAR | SLASH | PLUS | EQ | GT | LT | GE | LE | NE | LARROW | COMMENT | STRING );"; + return "1:1: Tokens : ( T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | NL | WS | NAME | INT | FLOAT | STRING | LSQUARE | RSQUARE | EXCL | COMA | LPAREN | RPAREN | LCURLY | RCURLY | SEMI | COLON | PIPE | SHARP | QMARK | COLONCOLON | POINT | RARROW | MINUS | STAR | SLASH | PLUS | EQ | GT | LT | GE | LE | NE | LARROW | COMMENT );"; } } diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3Parser.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3Parser.java index 39d6b17b..a0425855 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3Parser.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3Parser.java @@ -1,78 +1,134 @@ -/** - * Copyright (c) 2008 INRIA. - * 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: - * INRIA - initial API and implementation - * - */ -// $ANTLR 3.0.1 D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g 2009-03-04 15:46:31 +// $ANTLR 3.2 Sep 23, 2009 12:02:23 ACG_ANTLR3.g 2019-12-05 18:11:16 package org.eclipse.m2m.atl.dsls.tcs.injector; -import org.antlr.runtime.ANTLRFileStream; -import org.antlr.runtime.BitSet; -import org.antlr.runtime.CharStream; -import org.antlr.runtime.CommonTokenStream; -import org.antlr.runtime.NoViableAltException; -import org.antlr.runtime.Parser; -import org.antlr.runtime.RecognitionException; -import org.antlr.runtime.Token; -import org.antlr.runtime.TokenStream; +import org.antlr.runtime.*; +import java.util.Stack; +import java.util.List; +import java.util.ArrayList; public class ACG_ANTLR3Parser extends Parser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "NAME", "STRING", "INT", "LCURLY", "RCURLY", "COLONCOLON", "LPAREN", "COMA", "RPAREN", "EQ", "SEMI", "PIPE", "LSQUARE", "RSQUARE", "COLON", "POINT", "RARROW", "MINUS", "STAR", "SLASH", "PLUS", "GT", "LT", "GE", "LE", "NE", "NL", "WS", "DIGIT", "ALPHA", "SNAME", "ESC", "FLOAT", "EXCL", "SHARP", "QMARK", "LARROW", "COMMENT", "'acg'", "'startsWith'", "'function'", "'attribute'", "'asm'", "'name'", "'code'", "'mode'", "'foreach'", "'in'", "'variable'", "'named'", "'operation'", "'context'", "'if'", "'else'", "'let'", "'analyze'", "'report'", "'critic'", "'error'", "'warning'", "'field'", "'param'", "'new'", "'dup'", "'dup_x1'", "'pop'", "'swap'", "'iterate'", "'enditerate'", "'getasm'", "'findme'", "'pusht'", "'pushf'", "'push'", "'pushi'", "'pushd'", "'load'", "'store'", "'call'", "'supercall'", "'get'", "'set'", "'goto'", "'self'", "'last'", "'then'", "'endif'", "'OclUndefined'", "'Sequence'", "'true'", "'false'", "'not'", "'div'", "'mod'", "'isa'", "'and'", "'or'", "'xor'", "'implies'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "NAME", "STRING", "INT", "LCURLY", "RCURLY", "COLONCOLON", "LPAREN", "COMA", "RPAREN", "EQ", "SEMI", "PIPE", "LSQUARE", "RSQUARE", "COLON", "POINT", "RARROW", "MINUS", "STAR", "SLASH", "PLUS", "GT", "LT", "GE", "LE", "NE", "NL", "WS", "DIGIT", "ALPHA", "SNAME", "ESC", "FLOAT", "EXCL", "SHARP", "QMARK", "LARROW", "COMMENT", "'acg'", "'startsWith'", "'function'", "'attribute'", "'asm'", "'name'", "'code'", "'mode'", "'foreach'", "'in'", "'variable'", "'named'", "'operation'", "'context'", "'if'", "'else'", "'let'", "'analyze'", "'report'", "'critic'", "'error'", "'warning'", "'field'", "'param'", "'new'", "'newin'", "'delete'", "'dup'", "'dup_x1'", "'pop'", "'swap'", "'iterate'", "'enditerate'", "'getasm'", "'findme'", "'pusht'", "'pushf'", "'push'", "'pushi'", "'pushd'", "'load'", "'store'", "'call'", "'pcall'", "'supercall'", "'get'", "'set'", "'goto'", "'self'", "'last'", "'then'", "'endif'", "'OclUndefined'", "'Sequence'", "'true'", "'false'", "'not'", "'div'", "'mod'", "'isa'", "'and'", "'or'", "'xor'", "'implies'" }; - public static final int GE=27; - public static final int LT=26; - public static final int STAR=22; - public static final int LSQUARE=16; - public static final int SHARP=38; - public static final int POINT=19; - public static final int ESC=35; - public static final int RARROW=20; - public static final int LARROW=40; - public static final int LCURLY=7; - public static final int EXCL=37; - public static final int FLOAT=36; - public static final int INT=6; + public static final int T__50=50; + public static final int QMARK=39; public static final int MINUS=21; public static final int RSQUARE=17; - public static final int EOF=-1; + public static final int T__59=59; + public static final int T__55=55; + public static final int T__56=56; + public static final int T__57=57; + public static final int T__58=58; + public static final int T__51=51; + public static final int T__52=52; + public static final int T__53=53; + public static final int T__54=54; public static final int COMA=11; - public static final int SEMI=14; - public static final int ALPHA=33; + public static final int T__60=60; + public static final int T__61=61; public static final int LPAREN=10; - public static final int COLON=18; + public static final int T__66=66; + public static final int T__67=67; + public static final int T__68=68; + public static final int T__69=69; + public static final int T__62=62; + public static final int T__63=63; + public static final int T__64=64; + public static final int T__65=65; + public static final int SEMI=14; public static final int COLONCOLON=9; + public static final int COMMENT=41; + public static final int ESC=35; + public static final int RCURLY=8; + public static final int LCURLY=7; + public static final int RARROW=20; + public static final int T__48=48; + public static final int STAR=22; + public static final int T__49=49; + public static final int LARROW=40; + public static final int T__44=44; + public static final int T__45=45; + public static final int STRING=5; + public static final int LE=28; + public static final int SHARP=38; + public static final int T__46=46; + public static final int T__47=47; + public static final int EXCL=37; + public static final int T__42=42; + public static final int T__43=43; + public static final int T__91=91; + public static final int T__100=100; + public static final int T__92=92; + public static final int T__93=93; + public static final int T__102=102; + public static final int T__94=94; + public static final int T__101=101; + public static final int T__90=90; + public static final int LT=26; + public static final int ALPHA=33; + public static final int PIPE=15; + public static final int T__99=99; + public static final int T__95=95; + public static final int T__96=96; + public static final int T__97=97; + public static final int T__98=98; public static final int RPAREN=12; + public static final int EQ=13; public static final int NAME=4; + public static final int NE=29; + public static final int NL=30; + public static final int PLUS=24; + public static final int T__70=70; + public static final int T__71=71; + public static final int FLOAT=36; + public static final int T__72=72; + public static final int INT=6; + public static final int T__77=77; + public static final int T__78=78; + public static final int T__79=79; + public static final int T__73=73; public static final int WS=31; + public static final int EOF=-1; + public static final int T__74=74; + public static final int T__75=75; + public static final int GE=27; + public static final int T__76=76; + public static final int T__80=80; + public static final int T__81=81; + public static final int T__82=82; + public static final int T__83=83; public static final int SLASH=23; public static final int SNAME=34; - public static final int RCURLY=8; + public static final int COLON=18; public static final int GT=25; - public static final int PLUS=24; - public static final int PIPE=15; public static final int DIGIT=32; - public static final int NL=30; - public static final int EQ=13; - public static final int COMMENT=41; - public static final int QMARK=39; - public static final int LE=28; - public static final int STRING=5; - public static final int NE=29; + public static final int LSQUARE=16; + public static final int T__88=88; + public static final int T__89=89; + public static final int T__84=84; + public static final int T__104=104; + public static final int POINT=19; + public static final int T__85=85; + public static final int T__103=103; + public static final int T__86=86; + public static final int T__87=87; + public static final int T__105=105; + + // delegates + // delegators + public ACG_ANTLR3Parser(TokenStream input) { - super(input); + this(input, new RecognizerSharedState()); + } + public ACG_ANTLR3Parser(TokenStream input, RecognizerSharedState state) { + super(input, state); + } - public String[] getTokenNames() { return tokenNames; } - public String getGrammarFileName() { return "D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g"; } + public String[] getTokenNames() { return ACG_ANTLR3Parser.tokenNames; } + public String getGrammarFileName() { return "ACG_ANTLR3.g"; } public org.eclipse.m2m.atl.dsls.tcs.injector.TCSRuntime ei = null; @@ -110,8 +166,8 @@ public class ACG_ANTLR3Parser extends Parser { - // $ANTLR start main - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:60:1: main returns [Object ret2] : ( (ret= aCG ) EOF ) ; + // $ANTLR start "main" + // ACG_ANTLR3.g:60:1: main returns [Object ret2] : ( (ret= aCG ) EOF ) ; public final Object main() throws RecognitionException { Object ret2 = null; @@ -119,18 +175,19 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:61:2: ( ( (ret= aCG ) EOF ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:61:4: ( (ret= aCG ) EOF ) + // ACG_ANTLR3.g:61:2: ( ( (ret= aCG ) EOF ) ) + // ACG_ANTLR3.g:61:4: ( (ret= aCG ) EOF ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:61:4: ( (ret= aCG ) EOF ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:61:5: (ret= aCG ) EOF + // ACG_ANTLR3.g:61:4: ( (ret= aCG ) EOF ) + // ACG_ANTLR3.g:61:5: (ret= aCG ) EOF { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:61:5: (ret= aCG ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:61:6: ret= aCG + // ACG_ANTLR3.g:61:5: (ret= aCG ) + // ACG_ANTLR3.g:61:6: ret= aCG { pushFollow(FOLLOW_aCG_in_main46); ret=aCG(); - _fsp--; + + state._fsp--; } @@ -154,11 +211,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end main + // $ANTLR end "main" - // $ANTLR start identifier - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:68:1: identifier returns [Object ret2] : ast= NAME ; + // $ANTLR start "identifier" + // ACG_ANTLR3.g:68:1: identifier returns [Object ret2] : ast= NAME ; public final Object identifier() throws RecognitionException { Object ret2 = null; @@ -166,11 +223,10 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.Object ret=null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:69:2: (ast= NAME ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:69:4: ast= NAME + // ACG_ANTLR3.g:69:2: (ast= NAME ) + // ACG_ANTLR3.g:69:4: ast= NAME { - ast=(Token)input.LT(1); - match(input,NAME,FOLLOW_NAME_in_identifier82); + ast=(Token)match(input,NAME,FOLLOW_NAME_in_identifier82); ret = ast.getText(); ei.setToken((Object)ast); ret2=ret; @@ -187,11 +243,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end identifier + // $ANTLR end "identifier" - // $ANTLR start identifierOrKeyword - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:76:1: identifierOrKeyword returns [Object ret2] : (ast= NAME | 'acg' | 'startsWith' | 'function' | 'attribute' | 'asm' | 'name' | 'code' | 'mode' | 'foreach' | 'in' | 'variable' | 'named' | 'operation' | 'context' | 'if' | 'else' | 'let' | 'analyze' | 'report' | 'critic' | 'error' | 'warning' | 'field' | 'param' | 'new' | 'dup' | 'dup_x1' | 'pop' | 'swap' | 'iterate' | 'enditerate' | 'getasm' | 'findme' | 'pusht' | 'pushf' | 'push' | 'pushi' | 'pushd' | 'load' | 'store' | 'call' | 'supercall' | 'get' | 'set' | 'goto' | 'self' | 'last' | 'then' | 'endif' | 'OclUndefined' | 'Sequence' | 'true' | 'false' | 'not' | 'div' | 'mod' | 'isa' | 'and' | 'or' | 'xor' | 'implies' ) ; + // $ANTLR start "identifierOrKeyword" + // ACG_ANTLR3.g:76:1: identifierOrKeyword returns [Object ret2] : (ast= NAME | 'acg' | 'startsWith' | 'function' | 'attribute' | 'asm' | 'name' | 'code' | 'mode' | 'foreach' | 'in' | 'variable' | 'named' | 'operation' | 'context' | 'if' | 'else' | 'let' | 'analyze' | 'report' | 'critic' | 'error' | 'warning' | 'field' | 'param' | 'new' | 'newin' | 'delete' | 'dup' | 'dup_x1' | 'pop' | 'swap' | 'iterate' | 'enditerate' | 'getasm' | 'findme' | 'pusht' | 'pushf' | 'push' | 'pushi' | 'pushd' | 'load' | 'store' | 'call' | 'pcall' | 'supercall' | 'get' | 'set' | 'goto' | 'self' | 'last' | 'then' | 'endif' | 'OclUndefined' | 'Sequence' | 'true' | 'false' | 'not' | 'div' | 'mod' | 'isa' | 'and' | 'or' | 'xor' | 'implies' ) ; public final Object identifierOrKeyword() throws RecognitionException { Object ret2 = null; @@ -199,11 +255,11 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.Object ret=null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:2: ( (ast= NAME | 'acg' | 'startsWith' | 'function' | 'attribute' | 'asm' | 'name' | 'code' | 'mode' | 'foreach' | 'in' | 'variable' | 'named' | 'operation' | 'context' | 'if' | 'else' | 'let' | 'analyze' | 'report' | 'critic' | 'error' | 'warning' | 'field' | 'param' | 'new' | 'dup' | 'dup_x1' | 'pop' | 'swap' | 'iterate' | 'enditerate' | 'getasm' | 'findme' | 'pusht' | 'pushf' | 'push' | 'pushi' | 'pushd' | 'load' | 'store' | 'call' | 'supercall' | 'get' | 'set' | 'goto' | 'self' | 'last' | 'then' | 'endif' | 'OclUndefined' | 'Sequence' | 'true' | 'false' | 'not' | 'div' | 'mod' | 'isa' | 'and' | 'or' | 'xor' | 'implies' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:4: (ast= NAME | 'acg' | 'startsWith' | 'function' | 'attribute' | 'asm' | 'name' | 'code' | 'mode' | 'foreach' | 'in' | 'variable' | 'named' | 'operation' | 'context' | 'if' | 'else' | 'let' | 'analyze' | 'report' | 'critic' | 'error' | 'warning' | 'field' | 'param' | 'new' | 'dup' | 'dup_x1' | 'pop' | 'swap' | 'iterate' | 'enditerate' | 'getasm' | 'findme' | 'pusht' | 'pushf' | 'push' | 'pushi' | 'pushd' | 'load' | 'store' | 'call' | 'supercall' | 'get' | 'set' | 'goto' | 'self' | 'last' | 'then' | 'endif' | 'OclUndefined' | 'Sequence' | 'true' | 'false' | 'not' | 'div' | 'mod' | 'isa' | 'and' | 'or' | 'xor' | 'implies' ) + // ACG_ANTLR3.g:77:2: ( (ast= NAME | 'acg' | 'startsWith' | 'function' | 'attribute' | 'asm' | 'name' | 'code' | 'mode' | 'foreach' | 'in' | 'variable' | 'named' | 'operation' | 'context' | 'if' | 'else' | 'let' | 'analyze' | 'report' | 'critic' | 'error' | 'warning' | 'field' | 'param' | 'new' | 'newin' | 'delete' | 'dup' | 'dup_x1' | 'pop' | 'swap' | 'iterate' | 'enditerate' | 'getasm' | 'findme' | 'pusht' | 'pushf' | 'push' | 'pushi' | 'pushd' | 'load' | 'store' | 'call' | 'pcall' | 'supercall' | 'get' | 'set' | 'goto' | 'self' | 'last' | 'then' | 'endif' | 'OclUndefined' | 'Sequence' | 'true' | 'false' | 'not' | 'div' | 'mod' | 'isa' | 'and' | 'or' | 'xor' | 'implies' ) ) + // ACG_ANTLR3.g:77:4: (ast= NAME | 'acg' | 'startsWith' | 'function' | 'attribute' | 'asm' | 'name' | 'code' | 'mode' | 'foreach' | 'in' | 'variable' | 'named' | 'operation' | 'context' | 'if' | 'else' | 'let' | 'analyze' | 'report' | 'critic' | 'error' | 'warning' | 'field' | 'param' | 'new' | 'newin' | 'delete' | 'dup' | 'dup_x1' | 'pop' | 'swap' | 'iterate' | 'enditerate' | 'getasm' | 'findme' | 'pusht' | 'pushf' | 'push' | 'pushi' | 'pushd' | 'load' | 'store' | 'call' | 'pcall' | 'supercall' | 'get' | 'set' | 'goto' | 'self' | 'last' | 'then' | 'endif' | 'OclUndefined' | 'Sequence' | 'true' | 'false' | 'not' | 'div' | 'mod' | 'isa' | 'and' | 'or' | 'xor' | 'implies' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:4: (ast= NAME | 'acg' | 'startsWith' | 'function' | 'attribute' | 'asm' | 'name' | 'code' | 'mode' | 'foreach' | 'in' | 'variable' | 'named' | 'operation' | 'context' | 'if' | 'else' | 'let' | 'analyze' | 'report' | 'critic' | 'error' | 'warning' | 'field' | 'param' | 'new' | 'dup' | 'dup_x1' | 'pop' | 'swap' | 'iterate' | 'enditerate' | 'getasm' | 'findme' | 'pusht' | 'pushf' | 'push' | 'pushi' | 'pushd' | 'load' | 'store' | 'call' | 'supercall' | 'get' | 'set' | 'goto' | 'self' | 'last' | 'then' | 'endif' | 'OclUndefined' | 'Sequence' | 'true' | 'false' | 'not' | 'div' | 'mod' | 'isa' | 'and' | 'or' | 'xor' | 'implies' ) - int alt1=62; + // ACG_ANTLR3.g:77:4: (ast= NAME | 'acg' | 'startsWith' | 'function' | 'attribute' | 'asm' | 'name' | 'code' | 'mode' | 'foreach' | 'in' | 'variable' | 'named' | 'operation' | 'context' | 'if' | 'else' | 'let' | 'analyze' | 'report' | 'critic' | 'error' | 'warning' | 'field' | 'param' | 'new' | 'newin' | 'delete' | 'dup' | 'dup_x1' | 'pop' | 'swap' | 'iterate' | 'enditerate' | 'getasm' | 'findme' | 'pusht' | 'pushf' | 'push' | 'pushi' | 'pushd' | 'load' | 'store' | 'call' | 'pcall' | 'supercall' | 'get' | 'set' | 'goto' | 'self' | 'last' | 'then' | 'endif' | 'OclUndefined' | 'Sequence' | 'true' | 'false' | 'not' | 'div' | 'mod' | 'isa' | 'and' | 'or' | 'xor' | 'implies' ) + int alt1=65; switch ( input.LA(1) ) { case NAME: { @@ -515,25 +571,39 @@ public class ACG_ANTLR3Parser extends Parser { alt1=62; } break; + case 103: + { + alt1=63; + } + break; + case 104: + { + alt1=64; + } + break; + case 105: + { + alt1=65; + } + break; default: NoViableAltException nvae = - new NoViableAltException("77:4: (ast= NAME | 'acg' | 'startsWith' | 'function' | 'attribute' | 'asm' | 'name' | 'code' | 'mode' | 'foreach' | 'in' | 'variable' | 'named' | 'operation' | 'context' | 'if' | 'else' | 'let' | 'analyze' | 'report' | 'critic' | 'error' | 'warning' | 'field' | 'param' | 'new' | 'dup' | 'dup_x1' | 'pop' | 'swap' | 'iterate' | 'enditerate' | 'getasm' | 'findme' | 'pusht' | 'pushf' | 'push' | 'pushi' | 'pushd' | 'load' | 'store' | 'call' | 'supercall' | 'get' | 'set' | 'goto' | 'self' | 'last' | 'then' | 'endif' | 'OclUndefined' | 'Sequence' | 'true' | 'false' | 'not' | 'div' | 'mod' | 'isa' | 'and' | 'or' | 'xor' | 'implies' )", 1, 0, input); + new NoViableAltException("", 1, 0, input); throw nvae; } switch (alt1) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:5: ast= NAME + // ACG_ANTLR3.g:77:5: ast= NAME { - ast=(Token)input.LT(1); - match(input,NAME,FOLLOW_NAME_in_identifierOrKeyword117); + ast=(Token)match(input,NAME,FOLLOW_NAME_in_identifierOrKeyword117); ret = ast.getText(); ei.setToken((Object)ast); } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:64: 'acg' + // ACG_ANTLR3.g:77:64: 'acg' { match(input,42,FOLLOW_42_in_identifierOrKeyword122); ret = "acg"; @@ -541,7 +611,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:86: 'startsWith' + // ACG_ANTLR3.g:77:86: 'startsWith' { match(input,43,FOLLOW_43_in_identifierOrKeyword127); ret = "startsWith"; @@ -549,7 +619,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:122: 'function' + // ACG_ANTLR3.g:77:122: 'function' { match(input,44,FOLLOW_44_in_identifierOrKeyword132); ret = "function"; @@ -557,7 +627,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:154: 'attribute' + // ACG_ANTLR3.g:77:154: 'attribute' { match(input,45,FOLLOW_45_in_identifierOrKeyword137); ret = "attribute"; @@ -565,7 +635,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 6 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:188: 'asm' + // ACG_ANTLR3.g:77:188: 'asm' { match(input,46,FOLLOW_46_in_identifierOrKeyword142); ret = "asm"; @@ -573,7 +643,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 7 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:210: 'name' + // ACG_ANTLR3.g:77:210: 'name' { match(input,47,FOLLOW_47_in_identifierOrKeyword147); ret = "name"; @@ -581,7 +651,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 8 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:234: 'code' + // ACG_ANTLR3.g:77:234: 'code' { match(input,48,FOLLOW_48_in_identifierOrKeyword152); ret = "code"; @@ -589,7 +659,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 9 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:258: 'mode' + // ACG_ANTLR3.g:77:258: 'mode' { match(input,49,FOLLOW_49_in_identifierOrKeyword157); ret = "mode"; @@ -597,7 +667,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 10 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:282: 'foreach' + // ACG_ANTLR3.g:77:282: 'foreach' { match(input,50,FOLLOW_50_in_identifierOrKeyword162); ret = "foreach"; @@ -605,7 +675,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 11 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:312: 'in' + // ACG_ANTLR3.g:77:312: 'in' { match(input,51,FOLLOW_51_in_identifierOrKeyword167); ret = "in"; @@ -613,7 +683,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 12 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:332: 'variable' + // ACG_ANTLR3.g:77:332: 'variable' { match(input,52,FOLLOW_52_in_identifierOrKeyword172); ret = "variable"; @@ -621,7 +691,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 13 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:364: 'named' + // ACG_ANTLR3.g:77:364: 'named' { match(input,53,FOLLOW_53_in_identifierOrKeyword177); ret = "named"; @@ -629,7 +699,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 14 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:390: 'operation' + // ACG_ANTLR3.g:77:390: 'operation' { match(input,54,FOLLOW_54_in_identifierOrKeyword182); ret = "operation"; @@ -637,7 +707,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 15 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:424: 'context' + // ACG_ANTLR3.g:77:424: 'context' { match(input,55,FOLLOW_55_in_identifierOrKeyword187); ret = "context"; @@ -645,7 +715,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 16 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:454: 'if' + // ACG_ANTLR3.g:77:454: 'if' { match(input,56,FOLLOW_56_in_identifierOrKeyword192); ret = "if"; @@ -653,7 +723,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 17 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:474: 'else' + // ACG_ANTLR3.g:77:474: 'else' { match(input,57,FOLLOW_57_in_identifierOrKeyword197); ret = "else"; @@ -661,7 +731,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 18 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:498: 'let' + // ACG_ANTLR3.g:77:498: 'let' { match(input,58,FOLLOW_58_in_identifierOrKeyword202); ret = "let"; @@ -669,7 +739,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 19 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:520: 'analyze' + // ACG_ANTLR3.g:77:520: 'analyze' { match(input,59,FOLLOW_59_in_identifierOrKeyword207); ret = "analyze"; @@ -677,7 +747,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 20 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:550: 'report' + // ACG_ANTLR3.g:77:550: 'report' { match(input,60,FOLLOW_60_in_identifierOrKeyword212); ret = "report"; @@ -685,7 +755,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 21 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:578: 'critic' + // ACG_ANTLR3.g:77:578: 'critic' { match(input,61,FOLLOW_61_in_identifierOrKeyword217); ret = "critic"; @@ -693,7 +763,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 22 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:606: 'error' + // ACG_ANTLR3.g:77:606: 'error' { match(input,62,FOLLOW_62_in_identifierOrKeyword222); ret = "error"; @@ -701,7 +771,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 23 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:632: 'warning' + // ACG_ANTLR3.g:77:632: 'warning' { match(input,63,FOLLOW_63_in_identifierOrKeyword227); ret = "warning"; @@ -709,7 +779,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 24 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:662: 'field' + // ACG_ANTLR3.g:77:662: 'field' { match(input,64,FOLLOW_64_in_identifierOrKeyword232); ret = "field"; @@ -717,7 +787,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 25 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:688: 'param' + // ACG_ANTLR3.g:77:688: 'param' { match(input,65,FOLLOW_65_in_identifierOrKeyword237); ret = "param"; @@ -725,7 +795,7 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 26 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:714: 'new' + // ACG_ANTLR3.g:77:714: 'new' { match(input,66,FOLLOW_66_in_identifierOrKeyword242); ret = "new"; @@ -733,289 +803,313 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 27 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:736: 'dup' + // ACG_ANTLR3.g:77:736: 'newin' { match(input,67,FOLLOW_67_in_identifierOrKeyword247); - ret = "dup"; + ret = "newin"; } break; case 28 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:758: 'dup_x1' + // ACG_ANTLR3.g:77:762: 'delete' { match(input,68,FOLLOW_68_in_identifierOrKeyword252); - ret = "dup_x1"; + ret = "delete"; } break; case 29 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:786: 'pop' + // ACG_ANTLR3.g:77:790: 'dup' { match(input,69,FOLLOW_69_in_identifierOrKeyword257); - ret = "pop"; + ret = "dup"; } break; case 30 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:808: 'swap' + // ACG_ANTLR3.g:77:812: 'dup_x1' { match(input,70,FOLLOW_70_in_identifierOrKeyword262); - ret = "swap"; + ret = "dup_x1"; } break; case 31 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:832: 'iterate' + // ACG_ANTLR3.g:77:840: 'pop' { match(input,71,FOLLOW_71_in_identifierOrKeyword267); - ret = "iterate"; + ret = "pop"; } break; case 32 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:862: 'enditerate' + // ACG_ANTLR3.g:77:862: 'swap' { match(input,72,FOLLOW_72_in_identifierOrKeyword272); - ret = "enditerate"; + ret = "swap"; } break; case 33 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:898: 'getasm' + // ACG_ANTLR3.g:77:886: 'iterate' { match(input,73,FOLLOW_73_in_identifierOrKeyword277); - ret = "getasm"; + ret = "iterate"; } break; case 34 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:926: 'findme' + // ACG_ANTLR3.g:77:916: 'enditerate' { match(input,74,FOLLOW_74_in_identifierOrKeyword282); - ret = "findme"; + ret = "enditerate"; } break; case 35 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:954: 'pusht' + // ACG_ANTLR3.g:77:952: 'getasm' { match(input,75,FOLLOW_75_in_identifierOrKeyword287); - ret = "pusht"; + ret = "getasm"; } break; case 36 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:980: 'pushf' + // ACG_ANTLR3.g:77:980: 'findme' { match(input,76,FOLLOW_76_in_identifierOrKeyword292); - ret = "pushf"; + ret = "findme"; } break; case 37 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1006: 'push' + // ACG_ANTLR3.g:77:1008: 'pusht' { match(input,77,FOLLOW_77_in_identifierOrKeyword297); - ret = "push"; + ret = "pusht"; } break; case 38 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1030: 'pushi' + // ACG_ANTLR3.g:77:1034: 'pushf' { match(input,78,FOLLOW_78_in_identifierOrKeyword302); - ret = "pushi"; + ret = "pushf"; } break; case 39 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1056: 'pushd' + // ACG_ANTLR3.g:77:1060: 'push' { match(input,79,FOLLOW_79_in_identifierOrKeyword307); - ret = "pushd"; + ret = "push"; } break; case 40 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1082: 'load' + // ACG_ANTLR3.g:77:1084: 'pushi' { match(input,80,FOLLOW_80_in_identifierOrKeyword312); - ret = "load"; + ret = "pushi"; } break; case 41 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1106: 'store' + // ACG_ANTLR3.g:77:1110: 'pushd' { match(input,81,FOLLOW_81_in_identifierOrKeyword317); - ret = "store"; + ret = "pushd"; } break; case 42 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1132: 'call' + // ACG_ANTLR3.g:77:1136: 'load' { match(input,82,FOLLOW_82_in_identifierOrKeyword322); - ret = "call"; + ret = "load"; } break; case 43 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1156: 'supercall' + // ACG_ANTLR3.g:77:1160: 'store' { match(input,83,FOLLOW_83_in_identifierOrKeyword327); - ret = "supercall"; + ret = "store"; } break; case 44 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1190: 'get' + // ACG_ANTLR3.g:77:1186: 'call' { match(input,84,FOLLOW_84_in_identifierOrKeyword332); - ret = "get"; + ret = "call"; } break; case 45 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1212: 'set' + // ACG_ANTLR3.g:77:1210: 'pcall' { match(input,85,FOLLOW_85_in_identifierOrKeyword337); - ret = "set"; + ret = "pcall"; } break; case 46 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1234: 'goto' + // ACG_ANTLR3.g:77:1236: 'supercall' { match(input,86,FOLLOW_86_in_identifierOrKeyword342); - ret = "goto"; + ret = "supercall"; } break; case 47 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1258: 'self' + // ACG_ANTLR3.g:77:1270: 'get' { match(input,87,FOLLOW_87_in_identifierOrKeyword347); - ret = "self"; + ret = "get"; } break; case 48 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1282: 'last' + // ACG_ANTLR3.g:77:1292: 'set' { match(input,88,FOLLOW_88_in_identifierOrKeyword352); - ret = "last"; + ret = "set"; } break; case 49 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1306: 'then' + // ACG_ANTLR3.g:77:1314: 'goto' { match(input,89,FOLLOW_89_in_identifierOrKeyword357); - ret = "then"; + ret = "goto"; } break; case 50 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1330: 'endif' + // ACG_ANTLR3.g:77:1338: 'self' { match(input,90,FOLLOW_90_in_identifierOrKeyword362); - ret = "endif"; + ret = "self"; } break; case 51 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1356: 'OclUndefined' + // ACG_ANTLR3.g:77:1362: 'last' { match(input,91,FOLLOW_91_in_identifierOrKeyword367); - ret = "OclUndefined"; + ret = "last"; } break; case 52 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1396: 'Sequence' + // ACG_ANTLR3.g:77:1386: 'then' { match(input,92,FOLLOW_92_in_identifierOrKeyword372); - ret = "Sequence"; + ret = "then"; } break; case 53 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1428: 'true' + // ACG_ANTLR3.g:77:1410: 'endif' { match(input,93,FOLLOW_93_in_identifierOrKeyword377); - ret = "true"; + ret = "endif"; } break; case 54 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1452: 'false' + // ACG_ANTLR3.g:77:1436: 'OclUndefined' { match(input,94,FOLLOW_94_in_identifierOrKeyword382); - ret = "false"; + ret = "OclUndefined"; } break; case 55 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1478: 'not' + // ACG_ANTLR3.g:77:1476: 'Sequence' { match(input,95,FOLLOW_95_in_identifierOrKeyword387); - ret = "not"; + ret = "Sequence"; } break; case 56 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1500: 'div' + // ACG_ANTLR3.g:77:1508: 'true' { match(input,96,FOLLOW_96_in_identifierOrKeyword392); - ret = "div"; + ret = "true"; } break; case 57 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1522: 'mod' + // ACG_ANTLR3.g:77:1532: 'false' { match(input,97,FOLLOW_97_in_identifierOrKeyword397); - ret = "mod"; + ret = "false"; } break; case 58 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1544: 'isa' + // ACG_ANTLR3.g:77:1558: 'not' { match(input,98,FOLLOW_98_in_identifierOrKeyword402); - ret = "isa"; + ret = "not"; } break; case 59 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1566: 'and' + // ACG_ANTLR3.g:77:1580: 'div' { match(input,99,FOLLOW_99_in_identifierOrKeyword407); - ret = "and"; + ret = "div"; } break; case 60 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1588: 'or' + // ACG_ANTLR3.g:77:1602: 'mod' { match(input,100,FOLLOW_100_in_identifierOrKeyword412); - ret = "or"; + ret = "mod"; } break; case 61 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1608: 'xor' + // ACG_ANTLR3.g:77:1624: 'isa' { match(input,101,FOLLOW_101_in_identifierOrKeyword417); - ret = "xor"; + ret = "isa"; } break; case 62 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:77:1630: 'implies' + // ACG_ANTLR3.g:77:1646: 'and' { match(input,102,FOLLOW_102_in_identifierOrKeyword422); + ret = "and"; + + } + break; + case 63 : + // ACG_ANTLR3.g:77:1668: 'or' + { + match(input,103,FOLLOW_103_in_identifierOrKeyword427); + ret = "or"; + + } + break; + case 64 : + // ACG_ANTLR3.g:77:1688: 'xor' + { + match(input,104,FOLLOW_104_in_identifierOrKeyword432); + ret = "xor"; + + } + break; + case 65 : + // ACG_ANTLR3.g:77:1710: 'implies' + { + match(input,105,FOLLOW_105_in_identifierOrKeyword437); ret = "implies"; } @@ -1038,11 +1132,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end identifierOrKeyword + // $ANTLR end "identifierOrKeyword" - // $ANTLR start stringSymbol - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:84:1: stringSymbol returns [Object ret2] : ast= STRING ; + // $ANTLR start "stringSymbol" + // ACG_ANTLR3.g:84:1: stringSymbol returns [Object ret2] : ast= STRING ; public final Object stringSymbol() throws RecognitionException { Object ret2 = null; @@ -1050,11 +1144,10 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.Object ret=null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:85:2: (ast= STRING ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:85:4: ast= STRING + // ACG_ANTLR3.g:85:2: (ast= STRING ) + // ACG_ANTLR3.g:85:4: ast= STRING { - ast=(Token)input.LT(1); - match(input,STRING,FOLLOW_STRING_in_stringSymbol457); + ast=(Token)match(input,STRING,FOLLOW_STRING_in_stringSymbol472); ret = ei.unescapeString(ast.getText(), 1); ei.setToken((Object)ast); ret2=ret; @@ -1071,11 +1164,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end stringSymbol + // $ANTLR end "stringSymbol" - // $ANTLR start integerSymbol - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:92:1: integerSymbol returns [Object ret2] : ast= INT ; + // $ANTLR start "integerSymbol" + // ACG_ANTLR3.g:92:1: integerSymbol returns [Object ret2] : ast= INT ; public final Object integerSymbol() throws RecognitionException { Object ret2 = null; @@ -1083,11 +1176,10 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.Object ret=null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:93:2: (ast= INT ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:93:4: ast= INT + // ACG_ANTLR3.g:93:2: (ast= INT ) + // ACG_ANTLR3.g:93:4: ast= INT { - ast=(Token)input.LT(1); - match(input,INT,FOLLOW_INT_in_integerSymbol491); + ast=(Token)match(input,INT,FOLLOW_INT_in_integerSymbol506); ret = Integer.valueOf(ast.getText()); ei.setToken((Object)ast); ret2=ret; @@ -1104,45 +1196,47 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end integerSymbol + // $ANTLR end "integerSymbol" - // $ANTLR start aCG - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:100:1: aCG returns [Object ret2] : ( 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY ) ; + // $ANTLR start "aCG" + // ACG_ANTLR3.g:100:1: aCG returns [Object ret2] : ( 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY ) ; public final Object aCG() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("ACG", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ACG", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:2: ( ( 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:4: ( 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:101:2: ( ( 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY ) ) + // ACG_ANTLR3.g:101:4: ( 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:4: ( 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:5: 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:101:4: ( 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:101:5: 'acg' temp= identifier 'startsWith' temp= identifier LCURLY ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) RCURLY { - match(input,42,FOLLOW_42_in_aCG524); - pushFollow(FOLLOW_identifier_in_aCG528); + match(input,42,FOLLOW_42_in_aCG539); + pushFollow(FOLLOW_identifier_in_aCG543); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "metamodel", temp); - match(input,43,FOLLOW_43_in_aCG532); - pushFollow(FOLLOW_identifier_in_aCG536); + match(input,43,FOLLOW_43_in_aCG547); + pushFollow(FOLLOW_identifier_in_aCG551); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "startsWith", temp); - match(input,LCURLY,FOLLOW_LCURLY_in_aCG540); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:132: ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:133: ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) + match(input,LCURLY,FOLLOW_LCURLY_in_aCG555); + // ACG_ANTLR3.g:101:132: ( ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) ) + // ACG_ANTLR3.g:101:133: ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:133: ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:134: ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? + // ACG_ANTLR3.g:101:133: ( ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? ) + // ACG_ANTLR3.g:101:134: ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:134: ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? + // ACG_ANTLR3.g:101:134: ( (temp= aCGElement ( (temp= aCGElement ) )* ) )? int alt3=2; int LA3_0 = input.LA(1); @@ -1151,17 +1245,18 @@ public class ACG_ANTLR3Parser extends Parser { } switch (alt3) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:135: (temp= aCGElement ( (temp= aCGElement ) )* ) + // ACG_ANTLR3.g:101:135: (temp= aCGElement ( (temp= aCGElement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:135: (temp= aCGElement ( (temp= aCGElement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:136: temp= aCGElement ( (temp= aCGElement ) )* + // ACG_ANTLR3.g:101:135: (temp= aCGElement ( (temp= aCGElement ) )* ) + // ACG_ANTLR3.g:101:136: temp= aCGElement ( (temp= aCGElement ) )* { - pushFollow(FOLLOW_aCGElement_in_aCG548); + pushFollow(FOLLOW_aCGElement_in_aCG563); temp=aCGElement(); - _fsp--; + + state._fsp--; ei.set(ret, "elements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:185: ( (temp= aCGElement ) )* + // ACG_ANTLR3.g:101:185: ( (temp= aCGElement ) )* loop2: do { int alt2=2; @@ -1174,14 +1269,15 @@ public class ACG_ANTLR3Parser extends Parser { switch (alt2) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:186: (temp= aCGElement ) + // ACG_ANTLR3.g:101:186: (temp= aCGElement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:186: (temp= aCGElement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:101:187: temp= aCGElement + // ACG_ANTLR3.g:101:186: (temp= aCGElement ) + // ACG_ANTLR3.g:101:187: temp= aCGElement { - pushFollow(FOLLOW_aCGElement_in_aCG556); + pushFollow(FOLLOW_aCGElement_in_aCG571); temp=aCGElement(); - _fsp--; + + state._fsp--; ei.set(ret, "elements", temp); @@ -1211,7 +1307,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_aCG568); + match(input,RCURLY,FOLLOW_RCURLY_in_aCG583); } @@ -1233,11 +1329,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end aCG + // $ANTLR end "aCG" - // $ANTLR start aCGElement - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:111:1: aCGElement returns [Object ret2] : ( (ret= function | ret= attribute | ret= node ) ) ; + // $ANTLR start "aCGElement" + // ACG_ANTLR3.g:111:1: aCGElement returns [Object ret2] : ( (ret= function | ret= attribute | ret= node ) ) ; public final Object aCGElement() throws RecognitionException { Object ret2 = null; @@ -1245,13 +1341,13 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:112:2: ( ( (ret= function | ret= attribute | ret= node ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:112:4: ( (ret= function | ret= attribute | ret= node ) ) + // ACG_ANTLR3.g:112:2: ( ( (ret= function | ret= attribute | ret= node ) ) ) + // ACG_ANTLR3.g:112:4: ( (ret= function | ret= attribute | ret= node ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:112:4: ( (ret= function | ret= attribute | ret= node ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:112:5: (ret= function | ret= attribute | ret= node ) + // ACG_ANTLR3.g:112:4: ( (ret= function | ret= attribute | ret= node ) ) + // ACG_ANTLR3.g:112:5: (ret= function | ret= attribute | ret= node ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:112:5: (ret= function | ret= attribute | ret= node ) + // ACG_ANTLR3.g:112:5: (ret= function | ret= attribute | ret= node ) int alt4=3; switch ( input.LA(1) ) { case 44: @@ -1273,38 +1369,41 @@ public class ACG_ANTLR3Parser extends Parser { break; default: NoViableAltException nvae = - new NoViableAltException("112:5: (ret= function | ret= attribute | ret= node )", 4, 0, input); + new NoViableAltException("", 4, 0, input); throw nvae; } switch (alt4) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:112:6: ret= function + // ACG_ANTLR3.g:112:6: ret= function { - pushFollow(FOLLOW_function_in_aCGElement603); + pushFollow(FOLLOW_function_in_aCGElement618); ret=function(); - _fsp--; + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:112:20: ret= attribute + // ACG_ANTLR3.g:112:20: ret= attribute { - pushFollow(FOLLOW_attribute_in_aCGElement608); + pushFollow(FOLLOW_attribute_in_aCGElement623); ret=attribute(); - _fsp--; + + state._fsp--; } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:112:35: ret= node + // ACG_ANTLR3.g:112:35: ret= node { - pushFollow(FOLLOW_node_in_aCGElement613); + pushFollow(FOLLOW_node_in_aCGElement628); ret=node(); - _fsp--; + + state._fsp--; } @@ -1331,39 +1430,41 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end aCGElement + // $ANTLR end "aCGElement" - // $ANTLR start function - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:120:1: function returns [Object ret2] : ( 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI ) ; + // $ANTLR start "function" + // ACG_ANTLR3.g:120:1: function returns [Object ret2] : ( 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI ) ; public final Object function() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("Function", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Function", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:2: ( ( 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:4: ( 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI ) + // ACG_ANTLR3.g:121:2: ( ( 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI ) ) + // ACG_ANTLR3.g:121:4: ( 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:4: ( 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:5: 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI + // ACG_ANTLR3.g:121:4: ( 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI ) + // ACG_ANTLR3.g:121:5: 'function' temp= identifier COLONCOLON temp= identifier LPAREN ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) RPAREN EQ temp= expression SEMI { - match(input,44,FOLLOW_44_in_function646); - pushFollow(FOLLOW_identifier_in_function650); + match(input,44,FOLLOW_44_in_function661); + pushFollow(FOLLOW_identifier_in_function665); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "context", temp); - match(input,COLONCOLON,FOLLOW_COLONCOLON_in_function654); - pushFollow(FOLLOW_identifier_in_function658); + match(input,COLONCOLON,FOLLOW_COLONCOLON_in_function669); + pushFollow(FOLLOW_identifier_in_function673); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - match(input,LPAREN,FOLLOW_LPAREN_in_function662); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:127: ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) + match(input,LPAREN,FOLLOW_LPAREN_in_function677); + // ACG_ANTLR3.g:121:127: ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () ) int alt6=2; int LA6_0 = input.LA(1); @@ -1375,29 +1476,30 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("121:127: ( ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) | () )", 6, 0, input); + new NoViableAltException("", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:128: ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) + // ACG_ANTLR3.g:121:128: ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:128: ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:129: ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) + // ACG_ANTLR3.g:121:128: ( ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) ) + // ACG_ANTLR3.g:121:129: ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:129: ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:130: (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) + // ACG_ANTLR3.g:121:129: ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) ) + // ACG_ANTLR3.g:121:130: (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:130: (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:131: temp= parameter ( ( ( COMA ) temp= parameter ) )* + // ACG_ANTLR3.g:121:130: (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) + // ACG_ANTLR3.g:121:131: temp= parameter ( ( ( COMA ) temp= parameter ) )* { - pushFollow(FOLLOW_parameter_in_function670); + pushFollow(FOLLOW_parameter_in_function685); temp=parameter(); - _fsp--; + + state._fsp--; ei.set(ret, "parameters", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:181: ( ( ( COMA ) temp= parameter ) )* + // ACG_ANTLR3.g:121:181: ( ( ( COMA ) temp= parameter ) )* loop5: do { int alt5=2; @@ -1410,21 +1512,22 @@ public class ACG_ANTLR3Parser extends Parser { switch (alt5) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:182: ( ( COMA ) temp= parameter ) + // ACG_ANTLR3.g:121:182: ( ( COMA ) temp= parameter ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:182: ( ( COMA ) temp= parameter ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:183: ( COMA ) temp= parameter + // ACG_ANTLR3.g:121:182: ( ( COMA ) temp= parameter ) + // ACG_ANTLR3.g:121:183: ( COMA ) temp= parameter { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:183: ( COMA ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:184: COMA + // ACG_ANTLR3.g:121:183: ( COMA ) + // ACG_ANTLR3.g:121:184: COMA { - match(input,COMA,FOLLOW_COMA_in_function677); + match(input,COMA,FOLLOW_COMA_in_function692); } - pushFollow(FOLLOW_parameter_in_function682); + pushFollow(FOLLOW_parameter_in_function697); temp=parameter(); - _fsp--; + + state._fsp--; ei.set(ret, "parameters", temp); @@ -1453,10 +1556,10 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:250: () + // ACG_ANTLR3.g:121:250: () { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:250: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:121:251: + // ACG_ANTLR3.g:121:250: () + // ACG_ANTLR3.g:121:251: { } @@ -1467,14 +1570,15 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_function701); - match(input,EQ,FOLLOW_EQ_in_function703); - pushFollow(FOLLOW_expression_in_function707); + match(input,RPAREN,FOLLOW_RPAREN_in_function716); + match(input,EQ,FOLLOW_EQ_in_function718); + pushFollow(FOLLOW_expression_in_function722); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "body", temp); - match(input,SEMI,FOLLOW_SEMI_in_function711); + match(input,SEMI,FOLLOW_SEMI_in_function726); } @@ -1496,44 +1600,47 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end function + // $ANTLR end "function" - // $ANTLR start attribute - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:131:1: attribute returns [Object ret2] : ( 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI ) ; + // $ANTLR start "attribute" + // ACG_ANTLR3.g:131:1: attribute returns [Object ret2] : ( 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI ) ; public final Object attribute() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("Attribute", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Attribute", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:132:2: ( ( 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:132:4: ( 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI ) + // ACG_ANTLR3.g:132:2: ( ( 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI ) ) + // ACG_ANTLR3.g:132:4: ( 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:132:4: ( 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:132:5: 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI + // ACG_ANTLR3.g:132:4: ( 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI ) + // ACG_ANTLR3.g:132:5: 'attribute' temp= identifier COLONCOLON temp= identifier EQ temp= expression SEMI { - match(input,45,FOLLOW_45_in_attribute743); - pushFollow(FOLLOW_identifier_in_attribute747); + match(input,45,FOLLOW_45_in_attribute758); + pushFollow(FOLLOW_identifier_in_attribute762); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "context", temp); - match(input,COLONCOLON,FOLLOW_COLONCOLON_in_attribute751); - pushFollow(FOLLOW_identifier_in_attribute755); + match(input,COLONCOLON,FOLLOW_COLONCOLON_in_attribute766); + pushFollow(FOLLOW_identifier_in_attribute770); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - match(input,EQ,FOLLOW_EQ_in_attribute759); - pushFollow(FOLLOW_expression_in_attribute763); + match(input,EQ,FOLLOW_EQ_in_attribute774); + pushFollow(FOLLOW_expression_in_attribute778); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "body", temp); - match(input,SEMI,FOLLOW_SEMI_in_attribute767); + match(input,SEMI,FOLLOW_SEMI_in_attribute782); } @@ -1555,28 +1662,29 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end attribute + // $ANTLR end "attribute" - // $ANTLR start parameter - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:142:1: parameter returns [Object ret2] : (temp= identifier ) ; + // $ANTLR start "parameter" + // ACG_ANTLR3.g:142:1: parameter returns [Object ret2] : (temp= identifier ) ; public final Object parameter() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("Parameter", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Parameter", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:143:2: ( (temp= identifier ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:143:4: (temp= identifier ) + // ACG_ANTLR3.g:143:2: ( (temp= identifier ) ) + // ACG_ANTLR3.g:143:4: (temp= identifier ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:143:4: (temp= identifier ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:143:5: temp= identifier + // ACG_ANTLR3.g:143:4: (temp= identifier ) + // ACG_ANTLR3.g:143:5: temp= identifier { - pushFollow(FOLLOW_identifier_in_parameter801); + pushFollow(FOLLOW_identifier_in_parameter816); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); @@ -1600,11 +1708,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end parameter + // $ANTLR end "parameter" - // $ANTLR start node - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:153:1: node returns [Object ret2] : ( (ret= aSMNode | ret= codeNode | ret= simpleNode ) ) ; + // $ANTLR start "node" + // ACG_ANTLR3.g:153:1: node returns [Object ret2] : ( (ret= aSMNode | ret= codeNode | ret= simpleNode ) ) ; public final Object node() throws RecognitionException { Object ret2 = null; @@ -1612,13 +1720,13 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:154:2: ( ( (ret= aSMNode | ret= codeNode | ret= simpleNode ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:154:4: ( (ret= aSMNode | ret= codeNode | ret= simpleNode ) ) + // ACG_ANTLR3.g:154:2: ( ( (ret= aSMNode | ret= codeNode | ret= simpleNode ) ) ) + // ACG_ANTLR3.g:154:4: ( (ret= aSMNode | ret= codeNode | ret= simpleNode ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:154:4: ( (ret= aSMNode | ret= codeNode | ret= simpleNode ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:154:5: (ret= aSMNode | ret= codeNode | ret= simpleNode ) + // ACG_ANTLR3.g:154:4: ( (ret= aSMNode | ret= codeNode | ret= simpleNode ) ) + // ACG_ANTLR3.g:154:5: (ret= aSMNode | ret= codeNode | ret= simpleNode ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:154:5: (ret= aSMNode | ret= codeNode | ret= simpleNode ) + // ACG_ANTLR3.g:154:5: (ret= aSMNode | ret= codeNode | ret= simpleNode ) int alt7=3; switch ( input.LA(1) ) { case 46: @@ -1638,38 +1746,41 @@ public class ACG_ANTLR3Parser extends Parser { break; default: NoViableAltException nvae = - new NoViableAltException("154:5: (ret= aSMNode | ret= codeNode | ret= simpleNode )", 7, 0, input); + new NoViableAltException("", 7, 0, input); throw nvae; } switch (alt7) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:154:6: ret= aSMNode + // ACG_ANTLR3.g:154:6: ret= aSMNode { - pushFollow(FOLLOW_aSMNode_in_node838); + pushFollow(FOLLOW_aSMNode_in_node853); ret=aSMNode(); - _fsp--; + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:154:19: ret= codeNode + // ACG_ANTLR3.g:154:19: ret= codeNode { - pushFollow(FOLLOW_codeNode_in_node843); + pushFollow(FOLLOW_codeNode_in_node858); ret=codeNode(); - _fsp--; + + state._fsp--; } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:154:33: ret= simpleNode + // ACG_ANTLR3.g:154:33: ret= simpleNode { - pushFollow(FOLLOW_simpleNode_in_node848); + pushFollow(FOLLOW_simpleNode_in_node863); ret=simpleNode(); - _fsp--; + + state._fsp--; } @@ -1696,84 +1807,88 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end node + // $ANTLR end "node" - // $ANTLR start aSMNode - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:162:1: aSMNode returns [Object ret2] : ( 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; + // $ANTLR start "aSMNode" + // ACG_ANTLR3.g:162:1: aSMNode returns [Object ret2] : ( 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; public final Object aSMNode() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("ASMNode", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ASMNode", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:2: ( ( 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:4: ( 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:163:2: ( ( 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) + // ACG_ANTLR3.g:163:4: ( 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:4: ( 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:5: 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:163:4: ( 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:163:5: 'asm' temp= identifier 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,46,FOLLOW_46_in_aSMNode881); - pushFollow(FOLLOW_identifier_in_aSMNode885); + match(input,46,FOLLOW_46_in_aSMNode896); + pushFollow(FOLLOW_identifier_in_aSMNode900); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "element", temp); - match(input,47,FOLLOW_47_in_aSMNode889); - pushFollow(FOLLOW_expression_in_aSMNode893); + match(input,47,FOLLOW_47_in_aSMNode904); + pushFollow(FOLLOW_expression_in_aSMNode908); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - match(input,LCURLY,FOLLOW_LCURLY_in_aSMNode897); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:118: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:119: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,LCURLY,FOLLOW_LCURLY_in_aSMNode912); + // ACG_ANTLR3.g:163:118: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:163:119: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:119: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:120: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:163:119: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:163:120: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:120: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:163:120: ( (temp= statement ( (temp= statement ) )* ) )? int alt9=2; int LA9_0 = input.LA(1); - if ( (LA9_0==NAME||LA9_0==LSQUARE||LA9_0==50||LA9_0==52||LA9_0==54||LA9_0==56||(LA9_0>=58 && LA9_0<=60)||(LA9_0>=64 && LA9_0<=86)) ) { + if ( (LA9_0==NAME||LA9_0==LSQUARE||LA9_0==50||LA9_0==52||LA9_0==54||LA9_0==56||(LA9_0>=58 && LA9_0<=60)||(LA9_0>=64 && LA9_0<=89)) ) { alt9=1; } switch (alt9) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:121: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:163:121: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:121: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:122: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:163:121: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:163:122: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_aSMNode905); + pushFollow(FOLLOW_statement_in_aSMNode920); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:172: ( (temp= statement ) )* + // ACG_ANTLR3.g:163:172: ( (temp= statement ) )* loop8: do { int alt8=2; int LA8_0 = input.LA(1); - if ( (LA8_0==NAME||LA8_0==LSQUARE||LA8_0==50||LA8_0==52||LA8_0==54||LA8_0==56||(LA8_0>=58 && LA8_0<=60)||(LA8_0>=64 && LA8_0<=86)) ) { + if ( (LA8_0==NAME||LA8_0==LSQUARE||LA8_0==50||LA8_0==52||LA8_0==54||LA8_0==56||(LA8_0>=58 && LA8_0<=60)||(LA8_0>=64 && LA8_0<=89)) ) { alt8=1; } switch (alt8) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:173: (temp= statement ) + // ACG_ANTLR3.g:163:173: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:173: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:163:174: temp= statement + // ACG_ANTLR3.g:163:173: (temp= statement ) + // ACG_ANTLR3.g:163:174: temp= statement { - pushFollow(FOLLOW_statement_in_aSMNode913); + pushFollow(FOLLOW_statement_in_aSMNode928); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -1803,7 +1918,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_aSMNode925); + match(input,RCURLY,FOLLOW_RCURLY_in_aSMNode940); } @@ -1825,32 +1940,33 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end aSMNode + // $ANTLR end "aSMNode" - // $ANTLR start codeNode - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:173:1: codeNode returns [Object ret2] : ( 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; + // $ANTLR start "codeNode" + // ACG_ANTLR3.g:173:1: codeNode returns [Object ret2] : ( 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; public final Object codeNode() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("CodeNode", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("CodeNode", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:2: ( ( 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:4: ( 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:174:2: ( ( 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) + // ACG_ANTLR3.g:174:4: ( 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:4: ( 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:5: 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:174:4: ( 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:174:5: 'code' temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,48,FOLLOW_48_in_codeNode957); - pushFollow(FOLLOW_identifier_in_codeNode961); + match(input,48,FOLLOW_48_in_codeNode972); + pushFollow(FOLLOW_identifier_in_codeNode976); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "element", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:60: ( ( 'mode' temp= identifier ) | () ) + // ACG_ANTLR3.g:174:60: ( ( 'mode' temp= identifier ) | () ) int alt10=2; int LA10_0 = input.LA(1); @@ -1862,21 +1978,22 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("174:60: ( ( 'mode' temp= identifier ) | () )", 10, 0, input); + new NoViableAltException("", 10, 0, input); throw nvae; } switch (alt10) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:61: ( 'mode' temp= identifier ) + // ACG_ANTLR3.g:174:61: ( 'mode' temp= identifier ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:61: ( 'mode' temp= identifier ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:62: 'mode' temp= identifier + // ACG_ANTLR3.g:174:61: ( 'mode' temp= identifier ) + // ACG_ANTLR3.g:174:62: 'mode' temp= identifier { - match(input,49,FOLLOW_49_in_codeNode967); - pushFollow(FOLLOW_identifier_in_codeNode971); + match(input,49,FOLLOW_49_in_codeNode982); + pushFollow(FOLLOW_identifier_in_codeNode986); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "mode", temp); @@ -1887,10 +2004,10 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:119: () + // ACG_ANTLR3.g:174:119: () { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:119: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:120: + // ACG_ANTLR3.g:174:119: () + // ACG_ANTLR3.g:174:120: { } @@ -1901,7 +2018,7 @@ public class ACG_ANTLR3Parser extends Parser { } - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:126: ( ( PIPE temp= expression ) | () ) + // ACG_ANTLR3.g:174:126: ( ( PIPE temp= expression ) | () ) int alt11=2; int LA11_0 = input.LA(1); @@ -1913,21 +2030,22 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("174:126: ( ( PIPE temp= expression ) | () )", 11, 0, input); + new NoViableAltException("", 11, 0, input); throw nvae; } switch (alt11) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:127: ( PIPE temp= expression ) + // ACG_ANTLR3.g:174:127: ( PIPE temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:127: ( PIPE temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:128: PIPE temp= expression + // ACG_ANTLR3.g:174:127: ( PIPE temp= expression ) + // ACG_ANTLR3.g:174:128: PIPE temp= expression { - match(input,PIPE,FOLLOW_PIPE_in_codeNode987); - pushFollow(FOLLOW_expression_in_codeNode991); + match(input,PIPE,FOLLOW_PIPE_in_codeNode1002); + pushFollow(FOLLOW_expression_in_codeNode1006); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "guard", temp); @@ -1938,10 +2056,10 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:184: () + // ACG_ANTLR3.g:174:184: () { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:184: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:185: + // ACG_ANTLR3.g:174:184: () + // ACG_ANTLR3.g:174:185: { } @@ -1952,53 +2070,55 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,LCURLY,FOLLOW_LCURLY_in_codeNode1005); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:198: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:199: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,LCURLY,FOLLOW_LCURLY_in_codeNode1020); + // ACG_ANTLR3.g:174:198: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:174:199: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:199: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:200: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:174:199: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:174:200: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:200: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:174:200: ( (temp= statement ( (temp= statement ) )* ) )? int alt13=2; int LA13_0 = input.LA(1); - if ( (LA13_0==NAME||LA13_0==LSQUARE||LA13_0==50||LA13_0==52||LA13_0==54||LA13_0==56||(LA13_0>=58 && LA13_0<=60)||(LA13_0>=64 && LA13_0<=86)) ) { + if ( (LA13_0==NAME||LA13_0==LSQUARE||LA13_0==50||LA13_0==52||LA13_0==54||LA13_0==56||(LA13_0>=58 && LA13_0<=60)||(LA13_0>=64 && LA13_0<=89)) ) { alt13=1; } switch (alt13) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:201: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:174:201: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:201: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:202: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:174:201: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:174:202: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_codeNode1013); + pushFollow(FOLLOW_statement_in_codeNode1028); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:252: ( (temp= statement ) )* + // ACG_ANTLR3.g:174:252: ( (temp= statement ) )* loop12: do { int alt12=2; int LA12_0 = input.LA(1); - if ( (LA12_0==NAME||LA12_0==LSQUARE||LA12_0==50||LA12_0==52||LA12_0==54||LA12_0==56||(LA12_0>=58 && LA12_0<=60)||(LA12_0>=64 && LA12_0<=86)) ) { + if ( (LA12_0==NAME||LA12_0==LSQUARE||LA12_0==50||LA12_0==52||LA12_0==54||LA12_0==56||(LA12_0>=58 && LA12_0<=60)||(LA12_0>=64 && LA12_0<=89)) ) { alt12=1; } switch (alt12) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:253: (temp= statement ) + // ACG_ANTLR3.g:174:253: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:253: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:174:254: temp= statement + // ACG_ANTLR3.g:174:253: (temp= statement ) + // ACG_ANTLR3.g:174:254: temp= statement { - pushFollow(FOLLOW_statement_in_codeNode1021); + pushFollow(FOLLOW_statement_in_codeNode1036); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -2028,7 +2148,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_codeNode1033); + match(input,RCURLY,FOLLOW_RCURLY_in_codeNode1048); } @@ -2050,31 +2170,32 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end codeNode + // $ANTLR end "codeNode" - // $ANTLR start simpleNode - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:184:1: simpleNode returns [Object ret2] : (temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; + // $ANTLR start "simpleNode" + // ACG_ANTLR3.g:184:1: simpleNode returns [Object ret2] : (temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; public final Object simpleNode() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("SimpleNode", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SimpleNode", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:2: ( (temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:4: (temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:185:2: ( (temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) + // ACG_ANTLR3.g:185:4: (temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:4: (temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:5: temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:185:4: (temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:185:5: temp= identifier ( ( 'mode' temp= identifier ) | () ) ( ( PIPE temp= expression ) | () ) LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - pushFollow(FOLLOW_identifier_in_simpleNode1067); + pushFollow(FOLLOW_identifier_in_simpleNode1082); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "element", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:53: ( ( 'mode' temp= identifier ) | () ) + // ACG_ANTLR3.g:185:53: ( ( 'mode' temp= identifier ) | () ) int alt14=2; int LA14_0 = input.LA(1); @@ -2086,21 +2207,22 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("185:53: ( ( 'mode' temp= identifier ) | () )", 14, 0, input); + new NoViableAltException("", 14, 0, input); throw nvae; } switch (alt14) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:54: ( 'mode' temp= identifier ) + // ACG_ANTLR3.g:185:54: ( 'mode' temp= identifier ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:54: ( 'mode' temp= identifier ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:55: 'mode' temp= identifier + // ACG_ANTLR3.g:185:54: ( 'mode' temp= identifier ) + // ACG_ANTLR3.g:185:55: 'mode' temp= identifier { - match(input,49,FOLLOW_49_in_simpleNode1073); - pushFollow(FOLLOW_identifier_in_simpleNode1077); + match(input,49,FOLLOW_49_in_simpleNode1088); + pushFollow(FOLLOW_identifier_in_simpleNode1092); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "mode", temp); @@ -2111,10 +2233,10 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:112: () + // ACG_ANTLR3.g:185:112: () { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:112: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:113: + // ACG_ANTLR3.g:185:112: () + // ACG_ANTLR3.g:185:113: { } @@ -2125,7 +2247,7 @@ public class ACG_ANTLR3Parser extends Parser { } - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:119: ( ( PIPE temp= expression ) | () ) + // ACG_ANTLR3.g:185:119: ( ( PIPE temp= expression ) | () ) int alt15=2; int LA15_0 = input.LA(1); @@ -2137,21 +2259,22 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("185:119: ( ( PIPE temp= expression ) | () )", 15, 0, input); + new NoViableAltException("", 15, 0, input); throw nvae; } switch (alt15) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:120: ( PIPE temp= expression ) + // ACG_ANTLR3.g:185:120: ( PIPE temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:120: ( PIPE temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:121: PIPE temp= expression + // ACG_ANTLR3.g:185:120: ( PIPE temp= expression ) + // ACG_ANTLR3.g:185:121: PIPE temp= expression { - match(input,PIPE,FOLLOW_PIPE_in_simpleNode1093); - pushFollow(FOLLOW_expression_in_simpleNode1097); + match(input,PIPE,FOLLOW_PIPE_in_simpleNode1108); + pushFollow(FOLLOW_expression_in_simpleNode1112); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "guard", temp); @@ -2162,10 +2285,10 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:177: () + // ACG_ANTLR3.g:185:177: () { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:177: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:178: + // ACG_ANTLR3.g:185:177: () + // ACG_ANTLR3.g:185:178: { } @@ -2176,53 +2299,55 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,LCURLY,FOLLOW_LCURLY_in_simpleNode1111); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:191: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:192: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,LCURLY,FOLLOW_LCURLY_in_simpleNode1126); + // ACG_ANTLR3.g:185:191: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:185:192: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:192: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:193: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:185:192: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:185:193: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:193: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:185:193: ( (temp= statement ( (temp= statement ) )* ) )? int alt17=2; int LA17_0 = input.LA(1); - if ( (LA17_0==NAME||LA17_0==LSQUARE||LA17_0==50||LA17_0==52||LA17_0==54||LA17_0==56||(LA17_0>=58 && LA17_0<=60)||(LA17_0>=64 && LA17_0<=86)) ) { + if ( (LA17_0==NAME||LA17_0==LSQUARE||LA17_0==50||LA17_0==52||LA17_0==54||LA17_0==56||(LA17_0>=58 && LA17_0<=60)||(LA17_0>=64 && LA17_0<=89)) ) { alt17=1; } switch (alt17) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:194: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:185:194: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:194: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:195: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:185:194: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:185:195: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_simpleNode1119); + pushFollow(FOLLOW_statement_in_simpleNode1134); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:245: ( (temp= statement ) )* + // ACG_ANTLR3.g:185:245: ( (temp= statement ) )* loop16: do { int alt16=2; int LA16_0 = input.LA(1); - if ( (LA16_0==NAME||LA16_0==LSQUARE||LA16_0==50||LA16_0==52||LA16_0==54||LA16_0==56||(LA16_0>=58 && LA16_0<=60)||(LA16_0>=64 && LA16_0<=86)) ) { + if ( (LA16_0==NAME||LA16_0==LSQUARE||LA16_0==50||LA16_0==52||LA16_0==54||LA16_0==56||(LA16_0>=58 && LA16_0<=60)||(LA16_0>=64 && LA16_0<=89)) ) { alt16=1; } switch (alt16) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:246: (temp= statement ) + // ACG_ANTLR3.g:185:246: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:246: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:185:247: temp= statement + // ACG_ANTLR3.g:185:246: (temp= statement ) + // ACG_ANTLR3.g:185:247: temp= statement { - pushFollow(FOLLOW_statement_in_simpleNode1127); + pushFollow(FOLLOW_statement_in_simpleNode1142); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -2252,7 +2377,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_simpleNode1139); + match(input,RCURLY,FOLLOW_RCURLY_in_simpleNode1154); } @@ -2274,11 +2399,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end simpleNode + // $ANTLR end "simpleNode" - // $ANTLR start statement - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:195:1: statement returns [Object ret2] : ( (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) ) ; + // $ANTLR start "statement" + // ACG_ANTLR3.g:195:1: statement returns [Object ret2] : ( (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) ) ; public final Object statement() throws RecognitionException { Object ret2 = null; @@ -2286,13 +2411,13 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:2: ( ( (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:4: ( (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) ) + // ACG_ANTLR3.g:196:2: ( ( (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) ) ) + // ACG_ANTLR3.g:196:4: ( (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:4: ( (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:5: (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) + // ACG_ANTLR3.g:196:4: ( (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) ) + // ACG_ANTLR3.g:196:5: (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:5: (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) + // ACG_ANTLR3.g:196:5: (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat ) int alt18=5; switch ( input.LA(1) ) { case LSQUARE: @@ -2317,7 +2442,7 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("196:5: (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat )", 18, 2, input); + new NoViableAltException("", 18, 2, input); throw nvae; } @@ -2360,64 +2485,72 @@ public class ACG_ANTLR3Parser extends Parser { case 84: case 85: case 86: + case 87: + case 88: + case 89: { alt18=5; } break; default: NoViableAltException nvae = - new NoViableAltException("196:5: (ret= compoundStat | ret= reportStat | ret= fieldStat | ret= paramStat | ret= emitStat )", 18, 0, input); + new NoViableAltException("", 18, 0, input); throw nvae; } switch (alt18) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:6: ret= compoundStat + // ACG_ANTLR3.g:196:6: ret= compoundStat { - pushFollow(FOLLOW_compoundStat_in_statement1174); + pushFollow(FOLLOW_compoundStat_in_statement1189); ret=compoundStat(); - _fsp--; + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:24: ret= reportStat + // ACG_ANTLR3.g:196:24: ret= reportStat { - pushFollow(FOLLOW_reportStat_in_statement1179); + pushFollow(FOLLOW_reportStat_in_statement1194); ret=reportStat(); - _fsp--; + + state._fsp--; } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:40: ret= fieldStat + // ACG_ANTLR3.g:196:40: ret= fieldStat { - pushFollow(FOLLOW_fieldStat_in_statement1184); + pushFollow(FOLLOW_fieldStat_in_statement1199); ret=fieldStat(); - _fsp--; + + state._fsp--; } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:55: ret= paramStat + // ACG_ANTLR3.g:196:55: ret= paramStat { - pushFollow(FOLLOW_paramStat_in_statement1189); + pushFollow(FOLLOW_paramStat_in_statement1204); ret=paramStat(); - _fsp--; + + state._fsp--; } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:196:70: ret= emitStat + // ACG_ANTLR3.g:196:70: ret= emitStat { - pushFollow(FOLLOW_emitStat_in_statement1194); + pushFollow(FOLLOW_emitStat_in_statement1209); ret=emitStat(); - _fsp--; + + state._fsp--; } @@ -2444,11 +2577,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end statement + // $ANTLR end "statement" - // $ANTLR start compoundStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:204:1: compoundStat returns [Object ret2] : ( (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) ) ; + // $ANTLR start "compoundStat" + // ACG_ANTLR3.g:204:1: compoundStat returns [Object ret2] : ( (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) ) ; public final Object compoundStat() throws RecognitionException { Object ret2 = null; @@ -2456,13 +2589,13 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:2: ( ( (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:4: ( (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) ) + // ACG_ANTLR3.g:205:2: ( ( (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) ) ) + // ACG_ANTLR3.g:205:4: ( (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:4: ( (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:5: (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) + // ACG_ANTLR3.g:205:4: ( (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) ) + // ACG_ANTLR3.g:205:5: (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:5: (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) + // ACG_ANTLR3.g:205:5: (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat ) int alt19=7; switch ( input.LA(1) ) { case 50: @@ -2502,78 +2635,85 @@ public class ACG_ANTLR3Parser extends Parser { break; default: NoViableAltException nvae = - new NoViableAltException("205:5: (ret= forEachStat | ret= onceStat | ret= variableStat | ret= operationStat | ret= conditionalStat | ret= letStat | ret= analyzeStat )", 19, 0, input); + new NoViableAltException("", 19, 0, input); throw nvae; } switch (alt19) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:6: ret= forEachStat + // ACG_ANTLR3.g:205:6: ret= forEachStat { - pushFollow(FOLLOW_forEachStat_in_compoundStat1230); + pushFollow(FOLLOW_forEachStat_in_compoundStat1245); ret=forEachStat(); - _fsp--; + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:23: ret= onceStat + // ACG_ANTLR3.g:205:23: ret= onceStat { - pushFollow(FOLLOW_onceStat_in_compoundStat1235); + pushFollow(FOLLOW_onceStat_in_compoundStat1250); ret=onceStat(); - _fsp--; + + state._fsp--; } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:37: ret= variableStat + // ACG_ANTLR3.g:205:37: ret= variableStat { - pushFollow(FOLLOW_variableStat_in_compoundStat1240); + pushFollow(FOLLOW_variableStat_in_compoundStat1255); ret=variableStat(); - _fsp--; + + state._fsp--; } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:55: ret= operationStat + // ACG_ANTLR3.g:205:55: ret= operationStat { - pushFollow(FOLLOW_operationStat_in_compoundStat1245); + pushFollow(FOLLOW_operationStat_in_compoundStat1260); ret=operationStat(); - _fsp--; + + state._fsp--; } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:74: ret= conditionalStat + // ACG_ANTLR3.g:205:74: ret= conditionalStat { - pushFollow(FOLLOW_conditionalStat_in_compoundStat1250); + pushFollow(FOLLOW_conditionalStat_in_compoundStat1265); ret=conditionalStat(); - _fsp--; + + state._fsp--; } break; case 6 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:95: ret= letStat + // ACG_ANTLR3.g:205:95: ret= letStat { - pushFollow(FOLLOW_letStat_in_compoundStat1255); + pushFollow(FOLLOW_letStat_in_compoundStat1270); ret=letStat(); - _fsp--; + + state._fsp--; } break; case 7 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:205:108: ret= analyzeStat + // ACG_ANTLR3.g:205:108: ret= analyzeStat { - pushFollow(FOLLOW_analyzeStat_in_compoundStat1260); + pushFollow(FOLLOW_analyzeStat_in_compoundStat1275); ret=analyzeStat(); - _fsp--; + + state._fsp--; } @@ -2600,86 +2740,90 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end compoundStat + // $ANTLR end "compoundStat" - // $ANTLR start forEachStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:213:1: forEachStat returns [Object ret2] : ( 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; + // $ANTLR start "forEachStat" + // ACG_ANTLR3.g:213:1: forEachStat returns [Object ret2] : ( 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; public final Object forEachStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("ForEachStat", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ForEachStat", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:2: ( ( 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:4: ( 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:214:2: ( ( 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) + // ACG_ANTLR3.g:214:4: ( 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:4: ( 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:5: 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:214:4: ( 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:214:5: 'foreach' LPAREN temp= variableDecl 'in' temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,50,FOLLOW_50_in_forEachStat1293); - match(input,LPAREN,FOLLOW_LPAREN_in_forEachStat1295); - pushFollow(FOLLOW_variableDecl_in_forEachStat1299); + match(input,50,FOLLOW_50_in_forEachStat1308); + match(input,LPAREN,FOLLOW_LPAREN_in_forEachStat1310); + pushFollow(FOLLOW_variableDecl_in_forEachStat1314); temp=variableDecl(); - _fsp--; + + state._fsp--; ei.set(ret, "iterator", temp); - match(input,51,FOLLOW_51_in_forEachStat1303); - pushFollow(FOLLOW_expression_in_forEachStat1307); + match(input,51,FOLLOW_51_in_forEachStat1318); + pushFollow(FOLLOW_expression_in_forEachStat1322); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "collection", temp); - match(input,RPAREN,FOLLOW_RPAREN_in_forEachStat1311); - match(input,LCURLY,FOLLOW_LCURLY_in_forEachStat1313); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:143: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:144: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,RPAREN,FOLLOW_RPAREN_in_forEachStat1326); + match(input,LCURLY,FOLLOW_LCURLY_in_forEachStat1328); + // ACG_ANTLR3.g:214:143: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:214:144: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:144: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:145: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:214:144: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:214:145: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:145: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:214:145: ( (temp= statement ( (temp= statement ) )* ) )? int alt21=2; int LA21_0 = input.LA(1); - if ( (LA21_0==NAME||LA21_0==LSQUARE||LA21_0==50||LA21_0==52||LA21_0==54||LA21_0==56||(LA21_0>=58 && LA21_0<=60)||(LA21_0>=64 && LA21_0<=86)) ) { + if ( (LA21_0==NAME||LA21_0==LSQUARE||LA21_0==50||LA21_0==52||LA21_0==54||LA21_0==56||(LA21_0>=58 && LA21_0<=60)||(LA21_0>=64 && LA21_0<=89)) ) { alt21=1; } switch (alt21) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:146: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:214:146: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:146: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:147: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:214:146: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:214:147: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_forEachStat1321); + pushFollow(FOLLOW_statement_in_forEachStat1336); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:197: ( (temp= statement ) )* + // ACG_ANTLR3.g:214:197: ( (temp= statement ) )* loop20: do { int alt20=2; int LA20_0 = input.LA(1); - if ( (LA20_0==NAME||LA20_0==LSQUARE||LA20_0==50||LA20_0==52||LA20_0==54||LA20_0==56||(LA20_0>=58 && LA20_0<=60)||(LA20_0>=64 && LA20_0<=86)) ) { + if ( (LA20_0==NAME||LA20_0==LSQUARE||LA20_0==50||LA20_0==52||LA20_0==54||LA20_0==56||(LA20_0>=58 && LA20_0<=60)||(LA20_0>=64 && LA20_0<=89)) ) { alt20=1; } switch (alt20) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:198: (temp= statement ) + // ACG_ANTLR3.g:214:198: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:198: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:214:199: temp= statement + // ACG_ANTLR3.g:214:198: (temp= statement ) + // ACG_ANTLR3.g:214:199: temp= statement { - pushFollow(FOLLOW_statement_in_forEachStat1329); + pushFollow(FOLLOW_statement_in_forEachStat1344); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -2709,7 +2853,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_forEachStat1341); + match(input,RCURLY,FOLLOW_RCURLY_in_forEachStat1356); } @@ -2731,72 +2875,74 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end forEachStat + // $ANTLR end "forEachStat" - // $ANTLR start onceStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:224:1: onceStat returns [Object ret2] : ( LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE ) ; + // $ANTLR start "onceStat" + // ACG_ANTLR3.g:224:1: onceStat returns [Object ret2] : ( LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE ) ; public final Object onceStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("OnceStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OnceStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:2: ( ( LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:4: ( LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE ) + // ACG_ANTLR3.g:225:2: ( ( LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE ) ) + // ACG_ANTLR3.g:225:4: ( LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:4: ( LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:5: LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE + // ACG_ANTLR3.g:225:4: ( LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE ) + // ACG_ANTLR3.g:225:5: LSQUARE ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RSQUARE { - match(input,LSQUARE,FOLLOW_LSQUARE_in_onceStat1373); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:13: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:14: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,LSQUARE,FOLLOW_LSQUARE_in_onceStat1388); + // ACG_ANTLR3.g:225:13: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:225:14: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:14: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:15: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:225:14: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:225:15: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:15: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:225:15: ( (temp= statement ( (temp= statement ) )* ) )? int alt23=2; int LA23_0 = input.LA(1); - if ( (LA23_0==NAME||LA23_0==LSQUARE||LA23_0==50||LA23_0==52||LA23_0==54||LA23_0==56||(LA23_0>=58 && LA23_0<=60)||(LA23_0>=64 && LA23_0<=86)) ) { + if ( (LA23_0==NAME||LA23_0==LSQUARE||LA23_0==50||LA23_0==52||LA23_0==54||LA23_0==56||(LA23_0>=58 && LA23_0<=60)||(LA23_0>=64 && LA23_0<=89)) ) { alt23=1; } switch (alt23) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:16: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:225:16: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:16: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:17: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:225:16: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:225:17: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_onceStat1381); + pushFollow(FOLLOW_statement_in_onceStat1396); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:67: ( (temp= statement ) )* + // ACG_ANTLR3.g:225:67: ( (temp= statement ) )* loop22: do { int alt22=2; int LA22_0 = input.LA(1); - if ( (LA22_0==NAME||LA22_0==LSQUARE||LA22_0==50||LA22_0==52||LA22_0==54||LA22_0==56||(LA22_0>=58 && LA22_0<=60)||(LA22_0>=64 && LA22_0<=86)) ) { + if ( (LA22_0==NAME||LA22_0==LSQUARE||LA22_0==50||LA22_0==52||LA22_0==54||LA22_0==56||(LA22_0>=58 && LA22_0<=60)||(LA22_0>=64 && LA22_0<=89)) ) { alt22=1; } switch (alt22) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:68: (temp= statement ) + // ACG_ANTLR3.g:225:68: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:68: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:225:69: temp= statement + // ACG_ANTLR3.g:225:68: (temp= statement ) + // ACG_ANTLR3.g:225:69: temp= statement { - pushFollow(FOLLOW_statement_in_onceStat1389); + pushFollow(FOLLOW_statement_in_onceStat1404); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -2826,7 +2972,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RSQUARE,FOLLOW_RSQUARE_in_onceStat1401); + match(input,RSQUARE,FOLLOW_RSQUARE_in_onceStat1416); } @@ -2848,84 +2994,88 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end onceStat + // $ANTLR end "onceStat" - // $ANTLR start variableStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:235:1: variableStat returns [Object ret2] : ( 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; + // $ANTLR start "variableStat" + // ACG_ANTLR3.g:235:1: variableStat returns [Object ret2] : ( 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; public final Object variableStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("VariableStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("VariableStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:2: ( ( 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:4: ( 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:236:2: ( ( 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) + // ACG_ANTLR3.g:236:4: ( 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:4: ( 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:5: 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:236:4: ( 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:236:5: 'variable' temp= expression 'named' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,52,FOLLOW_52_in_variableStat1433); - pushFollow(FOLLOW_expression_in_variableStat1437); + match(input,52,FOLLOW_52_in_variableStat1448); + pushFollow(FOLLOW_expression_in_variableStat1452); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "definition", temp); - match(input,53,FOLLOW_53_in_variableStat1441); - pushFollow(FOLLOW_expression_in_variableStat1445); + match(input,53,FOLLOW_53_in_variableStat1456); + pushFollow(FOLLOW_expression_in_variableStat1460); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - match(input,LCURLY,FOLLOW_LCURLY_in_variableStat1449); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:127: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:128: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,LCURLY,FOLLOW_LCURLY_in_variableStat1464); + // ACG_ANTLR3.g:236:127: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:236:128: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:128: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:129: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:236:128: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:236:129: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:129: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:236:129: ( (temp= statement ( (temp= statement ) )* ) )? int alt25=2; int LA25_0 = input.LA(1); - if ( (LA25_0==NAME||LA25_0==LSQUARE||LA25_0==50||LA25_0==52||LA25_0==54||LA25_0==56||(LA25_0>=58 && LA25_0<=60)||(LA25_0>=64 && LA25_0<=86)) ) { + if ( (LA25_0==NAME||LA25_0==LSQUARE||LA25_0==50||LA25_0==52||LA25_0==54||LA25_0==56||(LA25_0>=58 && LA25_0<=60)||(LA25_0>=64 && LA25_0<=89)) ) { alt25=1; } switch (alt25) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:130: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:236:130: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:130: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:131: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:236:130: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:236:131: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_variableStat1457); + pushFollow(FOLLOW_statement_in_variableStat1472); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:181: ( (temp= statement ) )* + // ACG_ANTLR3.g:236:181: ( (temp= statement ) )* loop24: do { int alt24=2; int LA24_0 = input.LA(1); - if ( (LA24_0==NAME||LA24_0==LSQUARE||LA24_0==50||LA24_0==52||LA24_0==54||LA24_0==56||(LA24_0>=58 && LA24_0<=60)||(LA24_0>=64 && LA24_0<=86)) ) { + if ( (LA24_0==NAME||LA24_0==LSQUARE||LA24_0==50||LA24_0==52||LA24_0==54||LA24_0==56||(LA24_0>=58 && LA24_0<=60)||(LA24_0>=64 && LA24_0<=89)) ) { alt24=1; } switch (alt24) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:182: (temp= statement ) + // ACG_ANTLR3.g:236:182: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:182: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:236:183: temp= statement + // ACG_ANTLR3.g:236:182: (temp= statement ) + // ACG_ANTLR3.g:236:183: temp= statement { - pushFollow(FOLLOW_statement_in_variableStat1465); + pushFollow(FOLLOW_statement_in_variableStat1480); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -2955,7 +3105,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_variableStat1477); + match(input,RCURLY,FOLLOW_RCURLY_in_variableStat1492); } @@ -2977,85 +3127,89 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end variableStat + // $ANTLR end "variableStat" - // $ANTLR start operationStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:246:1: operationStat returns [Object ret2] : ( 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; + // $ANTLR start "operationStat" + // ACG_ANTLR3.g:246:1: operationStat returns [Object ret2] : ( 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; public final Object operationStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("OperationStat", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OperationStat", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:2: ( ( 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:4: ( 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:247:2: ( ( 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) + // ACG_ANTLR3.g:247:4: ( 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:4: ( 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:5: 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:247:4: ( 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:247:5: 'operation' 'context' temp= expression 'name' temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,54,FOLLOW_54_in_operationStat1509); - match(input,55,FOLLOW_55_in_operationStat1511); - pushFollow(FOLLOW_expression_in_operationStat1515); + match(input,54,FOLLOW_54_in_operationStat1524); + match(input,55,FOLLOW_55_in_operationStat1526); + pushFollow(FOLLOW_expression_in_operationStat1530); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "context", temp); - match(input,47,FOLLOW_47_in_operationStat1519); - pushFollow(FOLLOW_expression_in_operationStat1523); + match(input,47,FOLLOW_47_in_operationStat1534); + pushFollow(FOLLOW_expression_in_operationStat1538); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - match(input,LCURLY,FOLLOW_LCURLY_in_operationStat1527); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:134: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:135: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,LCURLY,FOLLOW_LCURLY_in_operationStat1542); + // ACG_ANTLR3.g:247:134: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:247:135: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:135: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:136: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:247:135: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:247:136: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:136: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:247:136: ( (temp= statement ( (temp= statement ) )* ) )? int alt27=2; int LA27_0 = input.LA(1); - if ( (LA27_0==NAME||LA27_0==LSQUARE||LA27_0==50||LA27_0==52||LA27_0==54||LA27_0==56||(LA27_0>=58 && LA27_0<=60)||(LA27_0>=64 && LA27_0<=86)) ) { + if ( (LA27_0==NAME||LA27_0==LSQUARE||LA27_0==50||LA27_0==52||LA27_0==54||LA27_0==56||(LA27_0>=58 && LA27_0<=60)||(LA27_0>=64 && LA27_0<=89)) ) { alt27=1; } switch (alt27) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:137: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:247:137: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:137: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:138: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:247:137: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:247:138: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_operationStat1535); + pushFollow(FOLLOW_statement_in_operationStat1550); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:188: ( (temp= statement ) )* + // ACG_ANTLR3.g:247:188: ( (temp= statement ) )* loop26: do { int alt26=2; int LA26_0 = input.LA(1); - if ( (LA26_0==NAME||LA26_0==LSQUARE||LA26_0==50||LA26_0==52||LA26_0==54||LA26_0==56||(LA26_0>=58 && LA26_0<=60)||(LA26_0>=64 && LA26_0<=86)) ) { + if ( (LA26_0==NAME||LA26_0==LSQUARE||LA26_0==50||LA26_0==52||LA26_0==54||LA26_0==56||(LA26_0>=58 && LA26_0<=60)||(LA26_0>=64 && LA26_0<=89)) ) { alt26=1; } switch (alt26) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:189: (temp= statement ) + // ACG_ANTLR3.g:247:189: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:189: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:247:190: temp= statement + // ACG_ANTLR3.g:247:189: (temp= statement ) + // ACG_ANTLR3.g:247:190: temp= statement { - pushFollow(FOLLOW_statement_in_operationStat1543); + pushFollow(FOLLOW_statement_in_operationStat1558); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -3085,7 +3239,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_operationStat1555); + match(input,RCURLY,FOLLOW_RCURLY_in_operationStat1570); } @@ -3107,80 +3261,83 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end operationStat + // $ANTLR end "operationStat" - // $ANTLR start conditionalStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:257:1: conditionalStat returns [Object ret2] : ( 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) ; + // $ANTLR start "conditionalStat" + // ACG_ANTLR3.g:257:1: conditionalStat returns [Object ret2] : ( 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) ; public final Object conditionalStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("ConditionalStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ConditionalStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:2: ( ( 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:4: ( 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) + // ACG_ANTLR3.g:258:2: ( ( 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) ) + // ACG_ANTLR3.g:258:4: ( 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:4: ( 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:5: 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) + // ACG_ANTLR3.g:258:4: ( 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) + // ACG_ANTLR3.g:258:5: 'if' LPAREN temp= expression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) { - match(input,56,FOLLOW_56_in_conditionalStat1587); - match(input,LPAREN,FOLLOW_LPAREN_in_conditionalStat1589); - pushFollow(FOLLOW_expression_in_conditionalStat1593); + match(input,56,FOLLOW_56_in_conditionalStat1602); + match(input,LPAREN,FOLLOW_LPAREN_in_conditionalStat1604); + pushFollow(FOLLOW_expression_in_conditionalStat1608); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "condition", temp); - match(input,RPAREN,FOLLOW_RPAREN_in_conditionalStat1597); - match(input,LCURLY,FOLLOW_LCURLY_in_conditionalStat1599); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:81: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:82: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,RPAREN,FOLLOW_RPAREN_in_conditionalStat1612); + match(input,LCURLY,FOLLOW_LCURLY_in_conditionalStat1614); + // ACG_ANTLR3.g:258:81: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:258:82: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:82: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:83: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:258:82: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:258:83: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:83: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:258:83: ( (temp= statement ( (temp= statement ) )* ) )? int alt29=2; int LA29_0 = input.LA(1); - if ( (LA29_0==NAME||LA29_0==LSQUARE||LA29_0==50||LA29_0==52||LA29_0==54||LA29_0==56||(LA29_0>=58 && LA29_0<=60)||(LA29_0>=64 && LA29_0<=86)) ) { + if ( (LA29_0==NAME||LA29_0==LSQUARE||LA29_0==50||LA29_0==52||LA29_0==54||LA29_0==56||(LA29_0>=58 && LA29_0<=60)||(LA29_0>=64 && LA29_0<=89)) ) { alt29=1; } switch (alt29) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:84: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:258:84: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:84: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:85: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:258:84: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:258:85: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_conditionalStat1607); + pushFollow(FOLLOW_statement_in_conditionalStat1622); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:135: ( (temp= statement ) )* + // ACG_ANTLR3.g:258:135: ( (temp= statement ) )* loop28: do { int alt28=2; int LA28_0 = input.LA(1); - if ( (LA28_0==NAME||LA28_0==LSQUARE||LA28_0==50||LA28_0==52||LA28_0==54||LA28_0==56||(LA28_0>=58 && LA28_0<=60)||(LA28_0>=64 && LA28_0<=86)) ) { + if ( (LA28_0==NAME||LA28_0==LSQUARE||LA28_0==50||LA28_0==52||LA28_0==54||LA28_0==56||(LA28_0>=58 && LA28_0<=60)||(LA28_0>=64 && LA28_0<=89)) ) { alt28=1; } switch (alt28) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:136: (temp= statement ) + // ACG_ANTLR3.g:258:136: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:136: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:137: temp= statement + // ACG_ANTLR3.g:258:136: (temp= statement ) + // ACG_ANTLR3.g:258:137: temp= statement { - pushFollow(FOLLOW_statement_in_conditionalStat1615); + pushFollow(FOLLOW_statement_in_conditionalStat1630); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -3210,78 +3367,80 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_conditionalStat1627); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:202: ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) + match(input,RCURLY,FOLLOW_RCURLY_in_conditionalStat1642); + // ACG_ANTLR3.g:258:202: ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) int alt32=2; int LA32_0 = input.LA(1); if ( (LA32_0==57) ) { alt32=1; } - else if ( (LA32_0==NAME||LA32_0==RCURLY||(LA32_0>=LSQUARE && LA32_0<=RSQUARE)||LA32_0==50||LA32_0==52||LA32_0==54||LA32_0==56||(LA32_0>=58 && LA32_0<=60)||(LA32_0>=64 && LA32_0<=86)) ) { + else if ( (LA32_0==NAME||LA32_0==RCURLY||(LA32_0>=LSQUARE && LA32_0<=RSQUARE)||LA32_0==50||LA32_0==52||LA32_0==54||LA32_0==56||(LA32_0>=58 && LA32_0<=60)||(LA32_0>=64 && LA32_0<=89)) ) { alt32=2; } else { NoViableAltException nvae = - new NoViableAltException("258:202: ( ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () )", 32, 0, input); + new NoViableAltException("", 32, 0, input); throw nvae; } switch (alt32) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:203: ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:258:203: ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:203: ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:204: 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:258:203: ( 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:258:204: 'else' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,57,FOLLOW_57_in_conditionalStat1631); - match(input,LCURLY,FOLLOW_LCURLY_in_conditionalStat1633); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:218: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:219: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,57,FOLLOW_57_in_conditionalStat1646); + match(input,LCURLY,FOLLOW_LCURLY_in_conditionalStat1648); + // ACG_ANTLR3.g:258:218: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:258:219: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:219: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:220: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:258:219: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:258:220: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:220: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:258:220: ( (temp= statement ( (temp= statement ) )* ) )? int alt31=2; int LA31_0 = input.LA(1); - if ( (LA31_0==NAME||LA31_0==LSQUARE||LA31_0==50||LA31_0==52||LA31_0==54||LA31_0==56||(LA31_0>=58 && LA31_0<=60)||(LA31_0>=64 && LA31_0<=86)) ) { + if ( (LA31_0==NAME||LA31_0==LSQUARE||LA31_0==50||LA31_0==52||LA31_0==54||LA31_0==56||(LA31_0>=58 && LA31_0<=60)||(LA31_0>=64 && LA31_0<=89)) ) { alt31=1; } switch (alt31) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:221: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:258:221: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:221: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:222: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:258:221: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:258:222: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_conditionalStat1641); + pushFollow(FOLLOW_statement_in_conditionalStat1656); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "elseStatements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:276: ( (temp= statement ) )* + // ACG_ANTLR3.g:258:276: ( (temp= statement ) )* loop30: do { int alt30=2; int LA30_0 = input.LA(1); - if ( (LA30_0==NAME||LA30_0==LSQUARE||LA30_0==50||LA30_0==52||LA30_0==54||LA30_0==56||(LA30_0>=58 && LA30_0<=60)||(LA30_0>=64 && LA30_0<=86)) ) { + if ( (LA30_0==NAME||LA30_0==LSQUARE||LA30_0==50||LA30_0==52||LA30_0==54||LA30_0==56||(LA30_0>=58 && LA30_0<=60)||(LA30_0>=64 && LA30_0<=89)) ) { alt30=1; } switch (alt30) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:277: (temp= statement ) + // ACG_ANTLR3.g:258:277: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:277: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:278: temp= statement + // ACG_ANTLR3.g:258:277: (temp= statement ) + // ACG_ANTLR3.g:258:278: temp= statement { - pushFollow(FOLLOW_statement_in_conditionalStat1649); + pushFollow(FOLLOW_statement_in_conditionalStat1664); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "elseStatements", temp); @@ -3311,7 +3470,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_conditionalStat1661); + match(input,RCURLY,FOLLOW_RCURLY_in_conditionalStat1676); } @@ -3320,10 +3479,10 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:352: () + // ACG_ANTLR3.g:258:352: () { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:352: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:258:353: + // ACG_ANTLR3.g:258:352: () + // ACG_ANTLR3.g:258:353: { } @@ -3355,84 +3514,88 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end conditionalStat + // $ANTLR end "conditionalStat" - // $ANTLR start letStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:268:1: letStat returns [Object ret2] : ( 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; + // $ANTLR start "letStat" + // ACG_ANTLR3.g:268:1: letStat returns [Object ret2] : ( 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; public final Object letStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("LetStat", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("LetStat", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:2: ( ( 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:4: ( 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:269:2: ( ( 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) + // ACG_ANTLR3.g:269:4: ( 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:4: ( 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:5: 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:269:4: ( 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:269:5: 'let' temp= variableDecl EQ temp= expression LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,58,FOLLOW_58_in_letStat1703); - pushFollow(FOLLOW_variableDecl_in_letStat1707); + match(input,58,FOLLOW_58_in_letStat1718); + pushFollow(FOLLOW_variableDecl_in_letStat1722); temp=variableDecl(); - _fsp--; + + state._fsp--; ei.set(ret, "variable", temp); - match(input,EQ,FOLLOW_EQ_in_letStat1711); - pushFollow(FOLLOW_expression_in_letStat1715); + match(input,EQ,FOLLOW_EQ_in_letStat1726); + pushFollow(FOLLOW_expression_in_letStat1730); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "value", temp); - match(input,LCURLY,FOLLOW_LCURLY_in_letStat1719); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:118: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:119: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,LCURLY,FOLLOW_LCURLY_in_letStat1734); + // ACG_ANTLR3.g:269:118: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:269:119: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:119: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:120: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:269:119: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:269:120: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:120: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:269:120: ( (temp= statement ( (temp= statement ) )* ) )? int alt34=2; int LA34_0 = input.LA(1); - if ( (LA34_0==NAME||LA34_0==LSQUARE||LA34_0==50||LA34_0==52||LA34_0==54||LA34_0==56||(LA34_0>=58 && LA34_0<=60)||(LA34_0>=64 && LA34_0<=86)) ) { + if ( (LA34_0==NAME||LA34_0==LSQUARE||LA34_0==50||LA34_0==52||LA34_0==54||LA34_0==56||(LA34_0>=58 && LA34_0<=60)||(LA34_0>=64 && LA34_0<=89)) ) { alt34=1; } switch (alt34) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:121: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:269:121: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:121: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:122: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:269:121: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:269:122: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_letStat1727); + pushFollow(FOLLOW_statement_in_letStat1742); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:172: ( (temp= statement ) )* + // ACG_ANTLR3.g:269:172: ( (temp= statement ) )* loop33: do { int alt33=2; int LA33_0 = input.LA(1); - if ( (LA33_0==NAME||LA33_0==LSQUARE||LA33_0==50||LA33_0==52||LA33_0==54||LA33_0==56||(LA33_0>=58 && LA33_0<=60)||(LA33_0>=64 && LA33_0<=86)) ) { + if ( (LA33_0==NAME||LA33_0==LSQUARE||LA33_0==50||LA33_0==52||LA33_0==54||LA33_0==56||(LA33_0>=58 && LA33_0<=60)||(LA33_0>=64 && LA33_0<=89)) ) { alt33=1; } switch (alt33) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:173: (temp= statement ) + // ACG_ANTLR3.g:269:173: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:173: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:269:174: temp= statement + // ACG_ANTLR3.g:269:173: (temp= statement ) + // ACG_ANTLR3.g:269:174: temp= statement { - pushFollow(FOLLOW_statement_in_letStat1735); + pushFollow(FOLLOW_statement_in_letStat1750); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -3462,7 +3625,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_letStat1747); + match(input,RCURLY,FOLLOW_RCURLY_in_letStat1762); } @@ -3484,58 +3647,60 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end letStat + // $ANTLR end "letStat" - // $ANTLR start analyzeStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:279:1: analyzeStat returns [Object ret2] : ( 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) ; + // $ANTLR start "analyzeStat" + // ACG_ANTLR3.g:279:1: analyzeStat returns [Object ret2] : ( 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) ; public final Object analyzeStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("AnalyzeStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("AnalyzeStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:2: ( ( 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:4: ( 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) + // ACG_ANTLR3.g:280:2: ( ( 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) ) + // ACG_ANTLR3.g:280:4: ( 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:4: ( 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:5: 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) + // ACG_ANTLR3.g:280:4: ( 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) ) + // ACG_ANTLR3.g:280:5: 'analyze' temp= expression ( ( 'mode' temp= identifier ) | () ) ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) { - match(input,59,FOLLOW_59_in_analyzeStat1779); - pushFollow(FOLLOW_expression_in_analyzeStat1783); + match(input,59,FOLLOW_59_in_analyzeStat1794); + pushFollow(FOLLOW_expression_in_analyzeStat1798); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "target", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:62: ( ( 'mode' temp= identifier ) | () ) + // ACG_ANTLR3.g:280:62: ( ( 'mode' temp= identifier ) | () ) int alt35=2; int LA35_0 = input.LA(1); if ( (LA35_0==49) ) { alt35=1; } - else if ( (LA35_0==NAME||(LA35_0>=LCURLY && LA35_0<=RCURLY)||(LA35_0>=LSQUARE && LA35_0<=RSQUARE)||LA35_0==50||LA35_0==52||LA35_0==54||LA35_0==56||(LA35_0>=58 && LA35_0<=60)||(LA35_0>=64 && LA35_0<=86)) ) { + else if ( (LA35_0==NAME||(LA35_0>=LCURLY && LA35_0<=RCURLY)||(LA35_0>=LSQUARE && LA35_0<=RSQUARE)||LA35_0==50||LA35_0==52||LA35_0==54||LA35_0==56||(LA35_0>=58 && LA35_0<=60)||(LA35_0>=64 && LA35_0<=89)) ) { alt35=2; } else { NoViableAltException nvae = - new NoViableAltException("280:62: ( ( 'mode' temp= identifier ) | () )", 35, 0, input); + new NoViableAltException("", 35, 0, input); throw nvae; } switch (alt35) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:63: ( 'mode' temp= identifier ) + // ACG_ANTLR3.g:280:63: ( 'mode' temp= identifier ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:63: ( 'mode' temp= identifier ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:64: 'mode' temp= identifier + // ACG_ANTLR3.g:280:63: ( 'mode' temp= identifier ) + // ACG_ANTLR3.g:280:64: 'mode' temp= identifier { - match(input,49,FOLLOW_49_in_analyzeStat1789); - pushFollow(FOLLOW_identifier_in_analyzeStat1793); + match(input,49,FOLLOW_49_in_analyzeStat1804); + pushFollow(FOLLOW_identifier_in_analyzeStat1808); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "mode", temp); @@ -3546,10 +3711,10 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:121: () + // ACG_ANTLR3.g:280:121: () { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:121: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:122: + // ACG_ANTLR3.g:280:121: () + // ACG_ANTLR3.g:280:122: { } @@ -3560,76 +3725,78 @@ public class ACG_ANTLR3Parser extends Parser { } - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:128: ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) + // ACG_ANTLR3.g:280:128: ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () ) int alt38=2; int LA38_0 = input.LA(1); if ( (LA38_0==LCURLY) ) { alt38=1; } - else if ( (LA38_0==NAME||LA38_0==RCURLY||(LA38_0>=LSQUARE && LA38_0<=RSQUARE)||LA38_0==50||LA38_0==52||LA38_0==54||LA38_0==56||(LA38_0>=58 && LA38_0<=60)||(LA38_0>=64 && LA38_0<=86)) ) { + else if ( (LA38_0==NAME||LA38_0==RCURLY||(LA38_0>=LSQUARE && LA38_0<=RSQUARE)||LA38_0==50||LA38_0==52||LA38_0==54||LA38_0==56||(LA38_0>=58 && LA38_0<=60)||(LA38_0>=64 && LA38_0<=89)) ) { alt38=2; } else { NoViableAltException nvae = - new NoViableAltException("280:128: ( ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) | () )", 38, 0, input); + new NoViableAltException("", 38, 0, input); throw nvae; } switch (alt38) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:129: ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:280:129: ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:129: ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:130: LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY + // ACG_ANTLR3.g:280:129: ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ACG_ANTLR3.g:280:130: LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,LCURLY,FOLLOW_LCURLY_in_analyzeStat1809); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:137: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:138: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + match(input,LCURLY,FOLLOW_LCURLY_in_analyzeStat1824); + // ACG_ANTLR3.g:280:137: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ACG_ANTLR3.g:280:138: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:138: ( ( (temp= statement ( (temp= statement ) )* ) )? ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:139: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:280:138: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ACG_ANTLR3.g:280:139: ( (temp= statement ( (temp= statement ) )* ) )? { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:139: ( (temp= statement ( (temp= statement ) )* ) )? + // ACG_ANTLR3.g:280:139: ( (temp= statement ( (temp= statement ) )* ) )? int alt37=2; int LA37_0 = input.LA(1); - if ( (LA37_0==NAME||LA37_0==LSQUARE||LA37_0==50||LA37_0==52||LA37_0==54||LA37_0==56||(LA37_0>=58 && LA37_0<=60)||(LA37_0>=64 && LA37_0<=86)) ) { + if ( (LA37_0==NAME||LA37_0==LSQUARE||LA37_0==50||LA37_0==52||LA37_0==54||LA37_0==56||(LA37_0>=58 && LA37_0<=60)||(LA37_0>=64 && LA37_0<=89)) ) { alt37=1; } switch (alt37) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:140: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:280:140: (temp= statement ( (temp= statement ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:140: (temp= statement ( (temp= statement ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:141: temp= statement ( (temp= statement ) )* + // ACG_ANTLR3.g:280:140: (temp= statement ( (temp= statement ) )* ) + // ACG_ANTLR3.g:280:141: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_analyzeStat1817); + pushFollow(FOLLOW_statement_in_analyzeStat1832); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:191: ( (temp= statement ) )* + // ACG_ANTLR3.g:280:191: ( (temp= statement ) )* loop36: do { int alt36=2; int LA36_0 = input.LA(1); - if ( (LA36_0==NAME||LA36_0==LSQUARE||LA36_0==50||LA36_0==52||LA36_0==54||LA36_0==56||(LA36_0>=58 && LA36_0<=60)||(LA36_0>=64 && LA36_0<=86)) ) { + if ( (LA36_0==NAME||LA36_0==LSQUARE||LA36_0==50||LA36_0==52||LA36_0==54||LA36_0==56||(LA36_0>=58 && LA36_0<=60)||(LA36_0>=64 && LA36_0<=89)) ) { alt36=1; } switch (alt36) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:192: (temp= statement ) + // ACG_ANTLR3.g:280:192: (temp= statement ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:192: (temp= statement ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:193: temp= statement + // ACG_ANTLR3.g:280:192: (temp= statement ) + // ACG_ANTLR3.g:280:193: temp= statement { - pushFollow(FOLLOW_statement_in_analyzeStat1825); + pushFollow(FOLLOW_statement_in_analyzeStat1840); temp=statement(); - _fsp--; + + state._fsp--; ei.set(ret, "statements", temp); @@ -3659,7 +3826,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_analyzeStat1837); + match(input,RCURLY,FOLLOW_RCURLY_in_analyzeStat1852); } @@ -3668,10 +3835,10 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:263: () + // ACG_ANTLR3.g:280:263: () { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:263: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:280:264: + // ACG_ANTLR3.g:280:263: () + // ACG_ANTLR3.g:280:264: { } @@ -3703,34 +3870,36 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end analyzeStat + // $ANTLR end "analyzeStat" - // $ANTLR start reportStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:290:1: reportStat returns [Object ret2] : ( 'report' temp= severity temp= expression ) ; + // $ANTLR start "reportStat" + // ACG_ANTLR3.g:290:1: reportStat returns [Object ret2] : ( 'report' temp= severity temp= expression ) ; public final Object reportStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("ReportStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ReportStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:291:2: ( ( 'report' temp= severity temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:291:4: ( 'report' temp= severity temp= expression ) + // ACG_ANTLR3.g:291:2: ( ( 'report' temp= severity temp= expression ) ) + // ACG_ANTLR3.g:291:4: ( 'report' temp= severity temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:291:4: ( 'report' temp= severity temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:291:5: 'report' temp= severity temp= expression + // ACG_ANTLR3.g:291:4: ( 'report' temp= severity temp= expression ) + // ACG_ANTLR3.g:291:5: 'report' temp= severity temp= expression { - match(input,60,FOLLOW_60_in_reportStat1879); - pushFollow(FOLLOW_severity_in_reportStat1883); + match(input,60,FOLLOW_60_in_reportStat1894); + pushFollow(FOLLOW_severity_in_reportStat1898); temp=severity(); - _fsp--; + + state._fsp--; ei.set(ret, "severity", temp); - pushFollow(FOLLOW_expression_in_reportStat1889); + pushFollow(FOLLOW_expression_in_reportStat1904); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "message", temp); @@ -3754,20 +3923,20 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end reportStat + // $ANTLR end "reportStat" - // $ANTLR start severity - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:301:1: severity returns [Object ret2] : ( ( 'critic' ) | ( 'error' ) | ( 'warning' ) ) ; + // $ANTLR start "severity" + // ACG_ANTLR3.g:301:1: severity returns [Object ret2] : ( ( 'critic' ) | ( 'error' ) | ( 'warning' ) ) ; public final Object severity() throws RecognitionException { Object ret2 = null; java.lang.Object ret=null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:2: ( ( ( 'critic' ) | ( 'error' ) | ( 'warning' ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:4: ( ( 'critic' ) | ( 'error' ) | ( 'warning' ) ) + // ACG_ANTLR3.g:302:2: ( ( ( 'critic' ) | ( 'error' ) | ( 'warning' ) ) ) + // ACG_ANTLR3.g:302:4: ( ( 'critic' ) | ( 'error' ) | ( 'warning' ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:4: ( ( 'critic' ) | ( 'error' ) | ( 'warning' ) ) + // ACG_ANTLR3.g:302:4: ( ( 'critic' ) | ( 'error' ) | ( 'warning' ) ) int alt39=3; switch ( input.LA(1) ) { case 61: @@ -3787,19 +3956,19 @@ public class ACG_ANTLR3Parser extends Parser { break; default: NoViableAltException nvae = - new NoViableAltException("302:4: ( ( 'critic' ) | ( 'error' ) | ( 'warning' ) )", 39, 0, input); + new NoViableAltException("", 39, 0, input); throw nvae; } switch (alt39) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:5: ( 'critic' ) + // ACG_ANTLR3.g:302:5: ( 'critic' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:5: ( 'critic' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:6: 'critic' + // ACG_ANTLR3.g:302:5: ( 'critic' ) + // ACG_ANTLR3.g:302:6: 'critic' { - match(input,61,FOLLOW_61_in_severity1924); + match(input,61,FOLLOW_61_in_severity1939); } @@ -3808,12 +3977,12 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:57: ( 'error' ) + // ACG_ANTLR3.g:302:57: ( 'error' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:57: ( 'error' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:58: 'error' + // ACG_ANTLR3.g:302:57: ( 'error' ) + // ACG_ANTLR3.g:302:58: 'error' { - match(input,62,FOLLOW_62_in_severity1931); + match(input,62,FOLLOW_62_in_severity1946); } @@ -3822,12 +3991,12 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:107: ( 'warning' ) + // ACG_ANTLR3.g:302:107: ( 'warning' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:107: ( 'warning' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:302:108: 'warning' + // ACG_ANTLR3.g:302:107: ( 'warning' ) + // ACG_ANTLR3.g:302:108: 'warning' { - match(input,63,FOLLOW_63_in_severity1938); + match(input,63,FOLLOW_63_in_severity1953); } @@ -3853,35 +4022,37 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end severity + // $ANTLR end "severity" - // $ANTLR start fieldStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:309:1: fieldStat returns [Object ret2] : ( 'field' temp= expression COLON temp= expression ) ; + // $ANTLR start "fieldStat" + // ACG_ANTLR3.g:309:1: fieldStat returns [Object ret2] : ( 'field' temp= expression COLON temp= expression ) ; public final Object fieldStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("FieldStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("FieldStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:310:2: ( ( 'field' temp= expression COLON temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:310:4: ( 'field' temp= expression COLON temp= expression ) + // ACG_ANTLR3.g:310:2: ( ( 'field' temp= expression COLON temp= expression ) ) + // ACG_ANTLR3.g:310:4: ( 'field' temp= expression COLON temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:310:4: ( 'field' temp= expression COLON temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:310:5: 'field' temp= expression COLON temp= expression + // ACG_ANTLR3.g:310:4: ( 'field' temp= expression COLON temp= expression ) + // ACG_ANTLR3.g:310:5: 'field' temp= expression COLON temp= expression { - match(input,64,FOLLOW_64_in_fieldStat1973); - pushFollow(FOLLOW_expression_in_fieldStat1977); + match(input,64,FOLLOW_64_in_fieldStat1988); + pushFollow(FOLLOW_expression_in_fieldStat1992); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - match(input,COLON,FOLLOW_COLON_in_fieldStat1981); - pushFollow(FOLLOW_expression_in_fieldStat1985); + match(input,COLON,FOLLOW_COLON_in_fieldStat1996); + pushFollow(FOLLOW_expression_in_fieldStat2000); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "type", temp); @@ -3905,35 +4076,37 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end fieldStat + // $ANTLR end "fieldStat" - // $ANTLR start paramStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:320:1: paramStat returns [Object ret2] : ( 'param' temp= expression COLON temp= expression ) ; + // $ANTLR start "paramStat" + // ACG_ANTLR3.g:320:1: paramStat returns [Object ret2] : ( 'param' temp= expression COLON temp= expression ) ; public final Object paramStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("ParamStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ParamStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:321:2: ( ( 'param' temp= expression COLON temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:321:4: ( 'param' temp= expression COLON temp= expression ) + // ACG_ANTLR3.g:321:2: ( ( 'param' temp= expression COLON temp= expression ) ) + // ACG_ANTLR3.g:321:4: ( 'param' temp= expression COLON temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:321:4: ( 'param' temp= expression COLON temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:321:5: 'param' temp= expression COLON temp= expression + // ACG_ANTLR3.g:321:4: ( 'param' temp= expression COLON temp= expression ) + // ACG_ANTLR3.g:321:5: 'param' temp= expression COLON temp= expression { - match(input,65,FOLLOW_65_in_paramStat2019); - pushFollow(FOLLOW_expression_in_paramStat2023); + match(input,65,FOLLOW_65_in_paramStat2034); + pushFollow(FOLLOW_expression_in_paramStat2038); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - match(input,COLON,FOLLOW_COLON_in_paramStat2027); - pushFollow(FOLLOW_expression_in_paramStat2031); + match(input,COLON,FOLLOW_COLON_in_paramStat2042); + pushFollow(FOLLOW_expression_in_paramStat2046); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "type", temp); @@ -3957,11 +4130,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end paramStat + // $ANTLR end "paramStat" - // $ANTLR start emitStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:331:1: emitStat returns [Object ret2] : ( (ret= labelStat | ret= newStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) ) ; + // $ANTLR start "emitStat" + // ACG_ANTLR3.g:331:1: emitStat returns [Object ret2] : ( (ret= labelStat | ret= newStat | ret= newinStat | ret= deleteStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) ) ; public final Object emitStat() throws RecognitionException { Object ret2 = null; @@ -3969,14 +4142,14 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:2: ( ( (ret= labelStat | ret= newStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:4: ( (ret= labelStat | ret= newStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) ) + // ACG_ANTLR3.g:332:2: ( ( (ret= labelStat | ret= newStat | ret= newinStat | ret= deleteStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) ) ) + // ACG_ANTLR3.g:332:4: ( (ret= labelStat | ret= newStat | ret= newinStat | ret= deleteStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:4: ( (ret= labelStat | ret= newStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:5: (ret= labelStat | ret= newStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) + // ACG_ANTLR3.g:332:4: ( (ret= labelStat | ret= newStat | ret= newinStat | ret= deleteStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) ) + // ACG_ANTLR3.g:332:5: (ret= labelStat | ret= newStat | ret= newinStat | ret= deleteStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:5: (ret= labelStat | ret= newStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) - int alt40=14; + // ACG_ANTLR3.g:332:5: (ret= labelStat | ret= newStat | ret= newinStat | ret= deleteStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat ) + int alt40=16; switch ( input.LA(1) ) { case NAME: { @@ -4039,7 +4212,15 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 77: + { + alt40=13; + } + break; case 78: + { + alt40=14; + } + break; case 79: case 80: case 81: @@ -4047,160 +4228,199 @@ public class ACG_ANTLR3Parser extends Parser { case 83: case 84: case 85: + case 86: + case 87: + case 88: { - alt40=13; + alt40=15; } break; case 56: - case 86: + case 89: { - alt40=14; + alt40=16; } break; default: NoViableAltException nvae = - new NoViableAltException("332:5: (ret= labelStat | ret= newStat | ret= dupStat | ret= dupX1Stat | ret= popStat | ret= swapStat | ret= iterateStat | ret= endIterateStat | ret= getAsmStat | ret= findMEStat | ret= pushTStat | ret= pushFStat | ret= emitWithOperandStat | ret= emitWithLabelRefStat )", 40, 0, input); + new NoViableAltException("", 40, 0, input); throw nvae; } switch (alt40) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:6: ret= labelStat + // ACG_ANTLR3.g:332:6: ret= labelStat { - pushFollow(FOLLOW_labelStat_in_emitStat2068); + pushFollow(FOLLOW_labelStat_in_emitStat2083); ret=labelStat(); - _fsp--; + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:21: ret= newStat + // ACG_ANTLR3.g:332:21: ret= newStat { - pushFollow(FOLLOW_newStat_in_emitStat2073); + pushFollow(FOLLOW_newStat_in_emitStat2088); ret=newStat(); - _fsp--; + + state._fsp--; } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:34: ret= dupStat + // ACG_ANTLR3.g:332:34: ret= newinStat { - pushFollow(FOLLOW_dupStat_in_emitStat2078); - ret=dupStat(); - _fsp--; + pushFollow(FOLLOW_newinStat_in_emitStat2093); + ret=newinStat(); + + state._fsp--; } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:47: ret= dupX1Stat + // ACG_ANTLR3.g:332:49: ret= deleteStat { - pushFollow(FOLLOW_dupX1Stat_in_emitStat2083); - ret=dupX1Stat(); - _fsp--; + pushFollow(FOLLOW_deleteStat_in_emitStat2098); + ret=deleteStat(); + + state._fsp--; } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:62: ret= popStat + // ACG_ANTLR3.g:332:65: ret= dupStat { - pushFollow(FOLLOW_popStat_in_emitStat2088); - ret=popStat(); - _fsp--; + pushFollow(FOLLOW_dupStat_in_emitStat2103); + ret=dupStat(); + + state._fsp--; } break; case 6 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:75: ret= swapStat + // ACG_ANTLR3.g:332:78: ret= dupX1Stat { - pushFollow(FOLLOW_swapStat_in_emitStat2093); - ret=swapStat(); - _fsp--; + pushFollow(FOLLOW_dupX1Stat_in_emitStat2108); + ret=dupX1Stat(); + + state._fsp--; } break; case 7 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:89: ret= iterateStat + // ACG_ANTLR3.g:332:93: ret= popStat { - pushFollow(FOLLOW_iterateStat_in_emitStat2098); - ret=iterateStat(); - _fsp--; + pushFollow(FOLLOW_popStat_in_emitStat2113); + ret=popStat(); + + state._fsp--; } break; case 8 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:106: ret= endIterateStat + // ACG_ANTLR3.g:332:106: ret= swapStat { - pushFollow(FOLLOW_endIterateStat_in_emitStat2103); - ret=endIterateStat(); - _fsp--; + pushFollow(FOLLOW_swapStat_in_emitStat2118); + ret=swapStat(); + + state._fsp--; } break; case 9 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:126: ret= getAsmStat + // ACG_ANTLR3.g:332:120: ret= iterateStat { - pushFollow(FOLLOW_getAsmStat_in_emitStat2108); - ret=getAsmStat(); - _fsp--; + pushFollow(FOLLOW_iterateStat_in_emitStat2123); + ret=iterateStat(); + + state._fsp--; } break; case 10 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:142: ret= findMEStat + // ACG_ANTLR3.g:332:137: ret= endIterateStat { - pushFollow(FOLLOW_findMEStat_in_emitStat2113); - ret=findMEStat(); - _fsp--; + pushFollow(FOLLOW_endIterateStat_in_emitStat2128); + ret=endIterateStat(); + + state._fsp--; } break; case 11 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:158: ret= pushTStat + // ACG_ANTLR3.g:332:157: ret= getAsmStat { - pushFollow(FOLLOW_pushTStat_in_emitStat2118); - ret=pushTStat(); - _fsp--; + pushFollow(FOLLOW_getAsmStat_in_emitStat2133); + ret=getAsmStat(); + + state._fsp--; } break; case 12 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:173: ret= pushFStat + // ACG_ANTLR3.g:332:173: ret= findMEStat { - pushFollow(FOLLOW_pushFStat_in_emitStat2123); - ret=pushFStat(); - _fsp--; + pushFollow(FOLLOW_findMEStat_in_emitStat2138); + ret=findMEStat(); + + state._fsp--; } break; case 13 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:188: ret= emitWithOperandStat + // ACG_ANTLR3.g:332:189: ret= pushTStat { - pushFollow(FOLLOW_emitWithOperandStat_in_emitStat2128); - ret=emitWithOperandStat(); - _fsp--; + pushFollow(FOLLOW_pushTStat_in_emitStat2143); + ret=pushTStat(); + + state._fsp--; } break; case 14 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:332:213: ret= emitWithLabelRefStat + // ACG_ANTLR3.g:332:204: ret= pushFStat { - pushFollow(FOLLOW_emitWithLabelRefStat_in_emitStat2133); + pushFollow(FOLLOW_pushFStat_in_emitStat2148); + ret=pushFStat(); + + state._fsp--; + + + } + break; + case 15 : + // ACG_ANTLR3.g:332:219: ret= emitWithOperandStat + { + pushFollow(FOLLOW_emitWithOperandStat_in_emitStat2153); + ret=emitWithOperandStat(); + + state._fsp--; + + + } + break; + case 16 : + // ACG_ANTLR3.g:332:244: ret= emitWithLabelRefStat + { + pushFollow(FOLLOW_emitWithLabelRefStat_in_emitStat2158); ret=emitWithLabelRefStat(); - _fsp--; + + state._fsp--; } @@ -4227,31 +4447,32 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end emitStat + // $ANTLR end "emitStat" - // $ANTLR start labelStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:340:1: labelStat returns [Object ret2] : (temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON ) ; + // $ANTLR start "labelStat" + // ACG_ANTLR3.g:340:1: labelStat returns [Object ret2] : (temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON ) ; public final Object labelStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("LabelStat", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("LabelStat", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:2: ( (temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:4: (temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON ) + // ACG_ANTLR3.g:341:2: ( (temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON ) ) + // ACG_ANTLR3.g:341:4: (temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:4: (temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:5: temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON + // ACG_ANTLR3.g:341:4: (temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON ) + // ACG_ANTLR3.g:341:5: temp= identifier ( ( LPAREN temp= expression RPAREN ) | () ) COLON { - pushFollow(FOLLOW_identifier_in_labelStat2168); + pushFollow(FOLLOW_identifier_in_labelStat2193); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:50: ( ( LPAREN temp= expression RPAREN ) | () ) + // ACG_ANTLR3.g:341:50: ( ( LPAREN temp= expression RPAREN ) | () ) int alt41=2; int LA41_0 = input.LA(1); @@ -4263,24 +4484,25 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("341:50: ( ( LPAREN temp= expression RPAREN ) | () )", 41, 0, input); + new NoViableAltException("", 41, 0, input); throw nvae; } switch (alt41) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:51: ( LPAREN temp= expression RPAREN ) + // ACG_ANTLR3.g:341:51: ( LPAREN temp= expression RPAREN ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:51: ( LPAREN temp= expression RPAREN ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:52: LPAREN temp= expression RPAREN + // ACG_ANTLR3.g:341:51: ( LPAREN temp= expression RPAREN ) + // ACG_ANTLR3.g:341:52: LPAREN temp= expression RPAREN { - match(input,LPAREN,FOLLOW_LPAREN_in_labelStat2174); - pushFollow(FOLLOW_expression_in_labelStat2178); + match(input,LPAREN,FOLLOW_LPAREN_in_labelStat2199); + pushFollow(FOLLOW_expression_in_labelStat2203); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "id", temp); - match(input,RPAREN,FOLLOW_RPAREN_in_labelStat2182); + match(input,RPAREN,FOLLOW_RPAREN_in_labelStat2207); } @@ -4289,10 +4511,10 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:114: () + // ACG_ANTLR3.g:341:114: () { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:114: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:341:115: + // ACG_ANTLR3.g:341:114: () + // ACG_ANTLR3.g:341:115: { } @@ -4303,7 +4525,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,COLON,FOLLOW_COLON_in_labelStat2194); + match(input,COLON,FOLLOW_COLON_in_labelStat2219); } @@ -4325,23 +4547,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end labelStat + // $ANTLR end "labelStat" - // $ANTLR start newStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:351:1: newStat returns [Object ret2] : ( 'new' ) ; + // $ANTLR start "newStat" + // ACG_ANTLR3.g:351:1: newStat returns [Object ret2] : ( 'new' ) ; public final Object newStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("NewStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("NewStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:352:2: ( ( 'new' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:352:4: ( 'new' ) + // ACG_ANTLR3.g:352:2: ( ( 'new' ) ) + // ACG_ANTLR3.g:352:4: ( 'new' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:352:4: ( 'new' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:352:5: 'new' + // ACG_ANTLR3.g:352:4: ( 'new' ) + // ACG_ANTLR3.g:352:5: 'new' { - match(input,66,FOLLOW_66_in_newStat2226); + match(input,66,FOLLOW_66_in_newStat2251); } @@ -4363,23 +4585,99 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end newStat + // $ANTLR end "newStat" + + + // $ANTLR start "newinStat" + // ACG_ANTLR3.g:362:1: newinStat returns [Object ret2] : ( 'newin' ) ; + public final Object newinStat() throws RecognitionException { + Object ret2 = null; + + Object ret=(state.backtracking==0) ? ei.create("NewinStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + try { + // ACG_ANTLR3.g:363:2: ( ( 'newin' ) ) + // ACG_ANTLR3.g:363:4: ( 'newin' ) + { + // ACG_ANTLR3.g:363:4: ( 'newin' ) + // ACG_ANTLR3.g:363:5: 'newin' + { + match(input,67,FOLLOW_67_in_newinStat2283); + + } + + + ei.leaveContext(false); + if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); + ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); + ret2=ret; + + } - // $ANTLR start dupStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:362:1: dupStat returns [Object ret2] : ( 'dup' ) ; + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + } + return ret2; + } + // $ANTLR end "newinStat" + + + // $ANTLR start "deleteStat" + // ACG_ANTLR3.g:373:1: deleteStat returns [Object ret2] : ( 'delete' ) ; + public final Object deleteStat() throws RecognitionException { + Object ret2 = null; + + Object ret=(state.backtracking==0) ? ei.create("DeleteStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + try { + // ACG_ANTLR3.g:374:2: ( ( 'delete' ) ) + // ACG_ANTLR3.g:374:4: ( 'delete' ) + { + // ACG_ANTLR3.g:374:4: ( 'delete' ) + // ACG_ANTLR3.g:374:5: 'delete' + { + match(input,68,FOLLOW_68_in_deleteStat2315); + + } + + + ei.leaveContext(false); + if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); + ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); + ret2=ret; + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + } + return ret2; + } + // $ANTLR end "deleteStat" + + + // $ANTLR start "dupStat" + // ACG_ANTLR3.g:384:1: dupStat returns [Object ret2] : ( 'dup' ) ; public final Object dupStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("DupStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("DupStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:363:2: ( ( 'dup' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:363:4: ( 'dup' ) + // ACG_ANTLR3.g:385:2: ( ( 'dup' ) ) + // ACG_ANTLR3.g:385:4: ( 'dup' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:363:4: ( 'dup' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:363:5: 'dup' + // ACG_ANTLR3.g:385:4: ( 'dup' ) + // ACG_ANTLR3.g:385:5: 'dup' { - match(input,67,FOLLOW_67_in_dupStat2258); + match(input,69,FOLLOW_69_in_dupStat2347); } @@ -4401,23 +4699,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end dupStat + // $ANTLR end "dupStat" - // $ANTLR start dupX1Stat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:373:1: dupX1Stat returns [Object ret2] : ( 'dup_x1' ) ; + // $ANTLR start "dupX1Stat" + // ACG_ANTLR3.g:395:1: dupX1Stat returns [Object ret2] : ( 'dup_x1' ) ; public final Object dupX1Stat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("DupX1Stat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("DupX1Stat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:374:2: ( ( 'dup_x1' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:374:4: ( 'dup_x1' ) + // ACG_ANTLR3.g:396:2: ( ( 'dup_x1' ) ) + // ACG_ANTLR3.g:396:4: ( 'dup_x1' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:374:4: ( 'dup_x1' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:374:5: 'dup_x1' + // ACG_ANTLR3.g:396:4: ( 'dup_x1' ) + // ACG_ANTLR3.g:396:5: 'dup_x1' { - match(input,68,FOLLOW_68_in_dupX1Stat2290); + match(input,70,FOLLOW_70_in_dupX1Stat2379); } @@ -4439,23 +4737,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end dupX1Stat + // $ANTLR end "dupX1Stat" - // $ANTLR start popStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:384:1: popStat returns [Object ret2] : ( 'pop' ) ; + // $ANTLR start "popStat" + // ACG_ANTLR3.g:406:1: popStat returns [Object ret2] : ( 'pop' ) ; public final Object popStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("PopStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("PopStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:385:2: ( ( 'pop' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:385:4: ( 'pop' ) + // ACG_ANTLR3.g:407:2: ( ( 'pop' ) ) + // ACG_ANTLR3.g:407:4: ( 'pop' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:385:4: ( 'pop' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:385:5: 'pop' + // ACG_ANTLR3.g:407:4: ( 'pop' ) + // ACG_ANTLR3.g:407:5: 'pop' { - match(input,69,FOLLOW_69_in_popStat2322); + match(input,71,FOLLOW_71_in_popStat2411); } @@ -4477,23 +4775,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end popStat + // $ANTLR end "popStat" - // $ANTLR start swapStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:395:1: swapStat returns [Object ret2] : ( 'swap' ) ; + // $ANTLR start "swapStat" + // ACG_ANTLR3.g:417:1: swapStat returns [Object ret2] : ( 'swap' ) ; public final Object swapStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("SwapStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SwapStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:396:2: ( ( 'swap' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:396:4: ( 'swap' ) + // ACG_ANTLR3.g:418:2: ( ( 'swap' ) ) + // ACG_ANTLR3.g:418:4: ( 'swap' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:396:4: ( 'swap' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:396:5: 'swap' + // ACG_ANTLR3.g:418:4: ( 'swap' ) + // ACG_ANTLR3.g:418:5: 'swap' { - match(input,70,FOLLOW_70_in_swapStat2354); + match(input,72,FOLLOW_72_in_swapStat2443); } @@ -4515,23 +4813,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end swapStat + // $ANTLR end "swapStat" - // $ANTLR start iterateStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:406:1: iterateStat returns [Object ret2] : ( 'iterate' ) ; + // $ANTLR start "iterateStat" + // ACG_ANTLR3.g:428:1: iterateStat returns [Object ret2] : ( 'iterate' ) ; public final Object iterateStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("IterateStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("IterateStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:407:2: ( ( 'iterate' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:407:4: ( 'iterate' ) + // ACG_ANTLR3.g:429:2: ( ( 'iterate' ) ) + // ACG_ANTLR3.g:429:4: ( 'iterate' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:407:4: ( 'iterate' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:407:5: 'iterate' + // ACG_ANTLR3.g:429:4: ( 'iterate' ) + // ACG_ANTLR3.g:429:5: 'iterate' { - match(input,71,FOLLOW_71_in_iterateStat2386); + match(input,73,FOLLOW_73_in_iterateStat2475); } @@ -4553,23 +4851,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end iterateStat + // $ANTLR end "iterateStat" - // $ANTLR start endIterateStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:417:1: endIterateStat returns [Object ret2] : ( 'enditerate' ) ; + // $ANTLR start "endIterateStat" + // ACG_ANTLR3.g:439:1: endIterateStat returns [Object ret2] : ( 'enditerate' ) ; public final Object endIterateStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("EndIterateStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("EndIterateStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:418:2: ( ( 'enditerate' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:418:4: ( 'enditerate' ) + // ACG_ANTLR3.g:440:2: ( ( 'enditerate' ) ) + // ACG_ANTLR3.g:440:4: ( 'enditerate' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:418:4: ( 'enditerate' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:418:5: 'enditerate' + // ACG_ANTLR3.g:440:4: ( 'enditerate' ) + // ACG_ANTLR3.g:440:5: 'enditerate' { - match(input,72,FOLLOW_72_in_endIterateStat2418); + match(input,74,FOLLOW_74_in_endIterateStat2507); } @@ -4591,23 +4889,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end endIterateStat + // $ANTLR end "endIterateStat" - // $ANTLR start getAsmStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:428:1: getAsmStat returns [Object ret2] : ( 'getasm' ) ; + // $ANTLR start "getAsmStat" + // ACG_ANTLR3.g:450:1: getAsmStat returns [Object ret2] : ( 'getasm' ) ; public final Object getAsmStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("GetAsmStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("GetAsmStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:429:2: ( ( 'getasm' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:429:4: ( 'getasm' ) + // ACG_ANTLR3.g:451:2: ( ( 'getasm' ) ) + // ACG_ANTLR3.g:451:4: ( 'getasm' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:429:4: ( 'getasm' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:429:5: 'getasm' + // ACG_ANTLR3.g:451:4: ( 'getasm' ) + // ACG_ANTLR3.g:451:5: 'getasm' { - match(input,73,FOLLOW_73_in_getAsmStat2450); + match(input,75,FOLLOW_75_in_getAsmStat2539); } @@ -4629,23 +4927,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end getAsmStat + // $ANTLR end "getAsmStat" - // $ANTLR start findMEStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:439:1: findMEStat returns [Object ret2] : ( 'findme' ) ; + // $ANTLR start "findMEStat" + // ACG_ANTLR3.g:461:1: findMEStat returns [Object ret2] : ( 'findme' ) ; public final Object findMEStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("FindMEStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("FindMEStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:440:2: ( ( 'findme' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:440:4: ( 'findme' ) + // ACG_ANTLR3.g:462:2: ( ( 'findme' ) ) + // ACG_ANTLR3.g:462:4: ( 'findme' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:440:4: ( 'findme' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:440:5: 'findme' + // ACG_ANTLR3.g:462:4: ( 'findme' ) + // ACG_ANTLR3.g:462:5: 'findme' { - match(input,74,FOLLOW_74_in_findMEStat2482); + match(input,76,FOLLOW_76_in_findMEStat2571); } @@ -4667,23 +4965,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end findMEStat + // $ANTLR end "findMEStat" - // $ANTLR start pushTStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:450:1: pushTStat returns [Object ret2] : ( 'pusht' ) ; + // $ANTLR start "pushTStat" + // ACG_ANTLR3.g:472:1: pushTStat returns [Object ret2] : ( 'pusht' ) ; public final Object pushTStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("PushTStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("PushTStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:451:2: ( ( 'pusht' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:451:4: ( 'pusht' ) + // ACG_ANTLR3.g:473:2: ( ( 'pusht' ) ) + // ACG_ANTLR3.g:473:4: ( 'pusht' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:451:4: ( 'pusht' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:451:5: 'pusht' + // ACG_ANTLR3.g:473:4: ( 'pusht' ) + // ACG_ANTLR3.g:473:5: 'pusht' { - match(input,75,FOLLOW_75_in_pushTStat2514); + match(input,77,FOLLOW_77_in_pushTStat2603); } @@ -4705,23 +5003,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end pushTStat + // $ANTLR end "pushTStat" - // $ANTLR start pushFStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:461:1: pushFStat returns [Object ret2] : ( 'pushf' ) ; + // $ANTLR start "pushFStat" + // ACG_ANTLR3.g:483:1: pushFStat returns [Object ret2] : ( 'pushf' ) ; public final Object pushFStat() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("PushFStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("PushFStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:462:2: ( ( 'pushf' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:462:4: ( 'pushf' ) + // ACG_ANTLR3.g:484:2: ( ( 'pushf' ) ) + // ACG_ANTLR3.g:484:4: ( 'pushf' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:462:4: ( 'pushf' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:462:5: 'pushf' + // ACG_ANTLR3.g:484:4: ( 'pushf' ) + // ACG_ANTLR3.g:484:5: 'pushf' { - match(input,76,FOLLOW_76_in_pushFStat2546); + match(input,78,FOLLOW_78_in_pushFStat2635); } @@ -4743,11 +5041,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end pushFStat + // $ANTLR end "pushFStat" - // $ANTLR start emitWithOperandStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:472:1: emitWithOperandStat returns [Object ret2] : ( (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= superCallStat | ret= getStat | ret= setStat ) ) ; + // $ANTLR start "emitWithOperandStat" + // ACG_ANTLR3.g:494:1: emitWithOperandStat returns [Object ret2] : ( (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= pCallStat | ret= superCallStat | ret= getStat | ret= setStat ) ) ; public final Object emitWithOperandStat() throws RecognitionException { Object ret2 = null; @@ -4755,154 +5053,179 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:2: ( ( (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= superCallStat | ret= getStat | ret= setStat ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:4: ( (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= superCallStat | ret= getStat | ret= setStat ) ) + // ACG_ANTLR3.g:495:2: ( ( (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= pCallStat | ret= superCallStat | ret= getStat | ret= setStat ) ) ) + // ACG_ANTLR3.g:495:4: ( (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= pCallStat | ret= superCallStat | ret= getStat | ret= setStat ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:4: ( (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= superCallStat | ret= getStat | ret= setStat ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:5: (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= superCallStat | ret= getStat | ret= setStat ) + // ACG_ANTLR3.g:495:4: ( (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= pCallStat | ret= superCallStat | ret= getStat | ret= setStat ) ) + // ACG_ANTLR3.g:495:5: (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= pCallStat | ret= superCallStat | ret= getStat | ret= setStat ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:5: (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= superCallStat | ret= getStat | ret= setStat ) - int alt42=9; + // ACG_ANTLR3.g:495:5: (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= pCallStat | ret= superCallStat | ret= getStat | ret= setStat ) + int alt42=10; switch ( input.LA(1) ) { - case 77: + case 79: { alt42=1; } break; - case 78: + case 80: { alt42=2; } break; - case 79: + case 81: { alt42=3; } break; - case 80: + case 82: { alt42=4; } break; - case 81: + case 83: { alt42=5; } break; - case 82: + case 84: { alt42=6; } break; - case 83: + case 85: { alt42=7; } break; - case 84: + case 86: { alt42=8; } break; - case 85: + case 87: { alt42=9; } break; + case 88: + { + alt42=10; + } + break; default: NoViableAltException nvae = - new NoViableAltException("473:5: (ret= pushStat | ret= pushIStat | ret= pushDStat | ret= loadStat | ret= storeStat | ret= callStat | ret= superCallStat | ret= getStat | ret= setStat )", 42, 0, input); + new NoViableAltException("", 42, 0, input); throw nvae; } switch (alt42) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:6: ret= pushStat + // ACG_ANTLR3.g:495:6: ret= pushStat { - pushFollow(FOLLOW_pushStat_in_emitWithOperandStat2581); + pushFollow(FOLLOW_pushStat_in_emitWithOperandStat2670); ret=pushStat(); - _fsp--; + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:20: ret= pushIStat + // ACG_ANTLR3.g:495:20: ret= pushIStat { - pushFollow(FOLLOW_pushIStat_in_emitWithOperandStat2586); + pushFollow(FOLLOW_pushIStat_in_emitWithOperandStat2675); ret=pushIStat(); - _fsp--; + + state._fsp--; } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:35: ret= pushDStat + // ACG_ANTLR3.g:495:35: ret= pushDStat { - pushFollow(FOLLOW_pushDStat_in_emitWithOperandStat2591); + pushFollow(FOLLOW_pushDStat_in_emitWithOperandStat2680); ret=pushDStat(); - _fsp--; + + state._fsp--; } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:50: ret= loadStat + // ACG_ANTLR3.g:495:50: ret= loadStat { - pushFollow(FOLLOW_loadStat_in_emitWithOperandStat2596); + pushFollow(FOLLOW_loadStat_in_emitWithOperandStat2685); ret=loadStat(); - _fsp--; + + state._fsp--; } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:64: ret= storeStat + // ACG_ANTLR3.g:495:64: ret= storeStat { - pushFollow(FOLLOW_storeStat_in_emitWithOperandStat2601); + pushFollow(FOLLOW_storeStat_in_emitWithOperandStat2690); ret=storeStat(); - _fsp--; + + state._fsp--; } break; case 6 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:79: ret= callStat + // ACG_ANTLR3.g:495:79: ret= callStat { - pushFollow(FOLLOW_callStat_in_emitWithOperandStat2606); + pushFollow(FOLLOW_callStat_in_emitWithOperandStat2695); ret=callStat(); - _fsp--; + + state._fsp--; } break; case 7 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:93: ret= superCallStat + // ACG_ANTLR3.g:495:93: ret= pCallStat { - pushFollow(FOLLOW_superCallStat_in_emitWithOperandStat2611); - ret=superCallStat(); - _fsp--; + pushFollow(FOLLOW_pCallStat_in_emitWithOperandStat2700); + ret=pCallStat(); + + state._fsp--; } break; case 8 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:112: ret= getStat + // ACG_ANTLR3.g:495:108: ret= superCallStat { - pushFollow(FOLLOW_getStat_in_emitWithOperandStat2616); - ret=getStat(); - _fsp--; + pushFollow(FOLLOW_superCallStat_in_emitWithOperandStat2705); + ret=superCallStat(); + + state._fsp--; } break; case 9 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:473:125: ret= setStat + // ACG_ANTLR3.g:495:127: ret= getStat { - pushFollow(FOLLOW_setStat_in_emitWithOperandStat2621); + pushFollow(FOLLOW_getStat_in_emitWithOperandStat2710); + ret=getStat(); + + state._fsp--; + + + } + break; + case 10 : + // ACG_ANTLR3.g:495:140: ret= setStat + { + pushFollow(FOLLOW_setStat_in_emitWithOperandStat2715); ret=setStat(); - _fsp--; + + state._fsp--; } @@ -4929,29 +5252,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end emitWithOperandStat + // $ANTLR end "emitWithOperandStat" - // $ANTLR start pushStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:481:1: pushStat returns [Object ret2] : ( 'push' temp= expression ) ; + // $ANTLR start "pushStat" + // ACG_ANTLR3.g:503:1: pushStat returns [Object ret2] : ( 'push' temp= expression ) ; public final Object pushStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("PushStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("PushStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:482:2: ( ( 'push' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:482:4: ( 'push' temp= expression ) + // ACG_ANTLR3.g:504:2: ( ( 'push' temp= expression ) ) + // ACG_ANTLR3.g:504:4: ( 'push' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:482:4: ( 'push' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:482:5: 'push' temp= expression + // ACG_ANTLR3.g:504:4: ( 'push' temp= expression ) + // ACG_ANTLR3.g:504:5: 'push' temp= expression { - match(input,77,FOLLOW_77_in_pushStat2654); - pushFollow(FOLLOW_expression_in_pushStat2658); + match(input,79,FOLLOW_79_in_pushStat2748); + pushFollow(FOLLOW_expression_in_pushStat2752); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "operand", temp); @@ -4975,29 +5299,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end pushStat + // $ANTLR end "pushStat" - // $ANTLR start pushIStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:492:1: pushIStat returns [Object ret2] : ( 'pushi' temp= expression ) ; + // $ANTLR start "pushIStat" + // ACG_ANTLR3.g:514:1: pushIStat returns [Object ret2] : ( 'pushi' temp= expression ) ; public final Object pushIStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("PushIStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("PushIStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:493:2: ( ( 'pushi' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:493:4: ( 'pushi' temp= expression ) + // ACG_ANTLR3.g:515:2: ( ( 'pushi' temp= expression ) ) + // ACG_ANTLR3.g:515:4: ( 'pushi' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:493:4: ( 'pushi' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:493:5: 'pushi' temp= expression + // ACG_ANTLR3.g:515:4: ( 'pushi' temp= expression ) + // ACG_ANTLR3.g:515:5: 'pushi' temp= expression { - match(input,78,FOLLOW_78_in_pushIStat2692); - pushFollow(FOLLOW_expression_in_pushIStat2696); + match(input,80,FOLLOW_80_in_pushIStat2786); + pushFollow(FOLLOW_expression_in_pushIStat2790); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "operand", temp); @@ -5021,29 +5346,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end pushIStat + // $ANTLR end "pushIStat" - // $ANTLR start pushDStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:503:1: pushDStat returns [Object ret2] : ( 'pushd' temp= expression ) ; + // $ANTLR start "pushDStat" + // ACG_ANTLR3.g:525:1: pushDStat returns [Object ret2] : ( 'pushd' temp= expression ) ; public final Object pushDStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("PushDStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("PushDStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:504:2: ( ( 'pushd' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:504:4: ( 'pushd' temp= expression ) + // ACG_ANTLR3.g:526:2: ( ( 'pushd' temp= expression ) ) + // ACG_ANTLR3.g:526:4: ( 'pushd' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:504:4: ( 'pushd' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:504:5: 'pushd' temp= expression + // ACG_ANTLR3.g:526:4: ( 'pushd' temp= expression ) + // ACG_ANTLR3.g:526:5: 'pushd' temp= expression { - match(input,79,FOLLOW_79_in_pushDStat2730); - pushFollow(FOLLOW_expression_in_pushDStat2734); + match(input,81,FOLLOW_81_in_pushDStat2824); + pushFollow(FOLLOW_expression_in_pushDStat2828); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "operand", temp); @@ -5067,29 +5393,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end pushDStat + // $ANTLR end "pushDStat" - // $ANTLR start loadStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:514:1: loadStat returns [Object ret2] : ( 'load' temp= expression ) ; + // $ANTLR start "loadStat" + // ACG_ANTLR3.g:536:1: loadStat returns [Object ret2] : ( 'load' temp= expression ) ; public final Object loadStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("LoadStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("LoadStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:515:2: ( ( 'load' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:515:4: ( 'load' temp= expression ) + // ACG_ANTLR3.g:537:2: ( ( 'load' temp= expression ) ) + // ACG_ANTLR3.g:537:4: ( 'load' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:515:4: ( 'load' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:515:5: 'load' temp= expression + // ACG_ANTLR3.g:537:4: ( 'load' temp= expression ) + // ACG_ANTLR3.g:537:5: 'load' temp= expression { - match(input,80,FOLLOW_80_in_loadStat2768); - pushFollow(FOLLOW_expression_in_loadStat2772); + match(input,82,FOLLOW_82_in_loadStat2862); + pushFollow(FOLLOW_expression_in_loadStat2866); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "operand", temp); @@ -5113,29 +5440,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end loadStat + // $ANTLR end "loadStat" - // $ANTLR start storeStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:525:1: storeStat returns [Object ret2] : ( 'store' temp= expression ) ; + // $ANTLR start "storeStat" + // ACG_ANTLR3.g:547:1: storeStat returns [Object ret2] : ( 'store' temp= expression ) ; public final Object storeStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("StoreStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("StoreStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:526:2: ( ( 'store' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:526:4: ( 'store' temp= expression ) + // ACG_ANTLR3.g:548:2: ( ( 'store' temp= expression ) ) + // ACG_ANTLR3.g:548:4: ( 'store' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:526:4: ( 'store' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:526:5: 'store' temp= expression + // ACG_ANTLR3.g:548:4: ( 'store' temp= expression ) + // ACG_ANTLR3.g:548:5: 'store' temp= expression { - match(input,81,FOLLOW_81_in_storeStat2806); - pushFollow(FOLLOW_expression_in_storeStat2810); + match(input,83,FOLLOW_83_in_storeStat2900); + pushFollow(FOLLOW_expression_in_storeStat2904); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "operand", temp); @@ -5159,29 +5487,77 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end storeStat + // $ANTLR end "storeStat" - // $ANTLR start callStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:536:1: callStat returns [Object ret2] : ( 'call' temp= expression ) ; + // $ANTLR start "callStat" + // ACG_ANTLR3.g:558:1: callStat returns [Object ret2] : ( 'call' temp= expression ) ; public final Object callStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("CallStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("CallStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + try { + // ACG_ANTLR3.g:559:2: ( ( 'call' temp= expression ) ) + // ACG_ANTLR3.g:559:4: ( 'call' temp= expression ) + { + // ACG_ANTLR3.g:559:4: ( 'call' temp= expression ) + // ACG_ANTLR3.g:559:5: 'call' temp= expression + { + match(input,84,FOLLOW_84_in_callStat2938); + pushFollow(FOLLOW_expression_in_callStat2942); + temp=expression(); + + state._fsp--; + + ei.set(ret, "operand", temp); + + } + + + ei.leaveContext(false); + if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); + ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); + ret2=ret; + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + } + return ret2; + } + // $ANTLR end "callStat" + + + // $ANTLR start "pCallStat" + // ACG_ANTLR3.g:569:1: pCallStat returns [Object ret2] : ( 'pcall' temp= expression ) ; + public final Object pCallStat() throws RecognitionException { + Object ret2 = null; + + Object temp = null; + + + Object ret=(state.backtracking==0) ? ei.create("PCallStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:537:2: ( ( 'call' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:537:4: ( 'call' temp= expression ) + // ACG_ANTLR3.g:570:2: ( ( 'pcall' temp= expression ) ) + // ACG_ANTLR3.g:570:4: ( 'pcall' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:537:4: ( 'call' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:537:5: 'call' temp= expression + // ACG_ANTLR3.g:570:4: ( 'pcall' temp= expression ) + // ACG_ANTLR3.g:570:5: 'pcall' temp= expression { - match(input,82,FOLLOW_82_in_callStat2844); - pushFollow(FOLLOW_expression_in_callStat2848); + match(input,85,FOLLOW_85_in_pCallStat2976); + pushFollow(FOLLOW_expression_in_pCallStat2980); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "operand", temp); @@ -5205,29 +5581,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end callStat + // $ANTLR end "pCallStat" - // $ANTLR start superCallStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:547:1: superCallStat returns [Object ret2] : ( 'supercall' temp= expression ) ; + // $ANTLR start "superCallStat" + // ACG_ANTLR3.g:580:1: superCallStat returns [Object ret2] : ( 'supercall' temp= expression ) ; public final Object superCallStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("SuperCallStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SuperCallStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:548:2: ( ( 'supercall' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:548:4: ( 'supercall' temp= expression ) + // ACG_ANTLR3.g:581:2: ( ( 'supercall' temp= expression ) ) + // ACG_ANTLR3.g:581:4: ( 'supercall' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:548:4: ( 'supercall' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:548:5: 'supercall' temp= expression + // ACG_ANTLR3.g:581:4: ( 'supercall' temp= expression ) + // ACG_ANTLR3.g:581:5: 'supercall' temp= expression { - match(input,83,FOLLOW_83_in_superCallStat2882); - pushFollow(FOLLOW_expression_in_superCallStat2886); + match(input,86,FOLLOW_86_in_superCallStat3014); + pushFollow(FOLLOW_expression_in_superCallStat3018); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "operand", temp); @@ -5251,29 +5628,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end superCallStat + // $ANTLR end "superCallStat" - // $ANTLR start getStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:558:1: getStat returns [Object ret2] : ( 'get' temp= expression ) ; + // $ANTLR start "getStat" + // ACG_ANTLR3.g:591:1: getStat returns [Object ret2] : ( 'get' temp= expression ) ; public final Object getStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("GetStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("GetStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:559:2: ( ( 'get' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:559:4: ( 'get' temp= expression ) + // ACG_ANTLR3.g:592:2: ( ( 'get' temp= expression ) ) + // ACG_ANTLR3.g:592:4: ( 'get' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:559:4: ( 'get' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:559:5: 'get' temp= expression + // ACG_ANTLR3.g:592:4: ( 'get' temp= expression ) + // ACG_ANTLR3.g:592:5: 'get' temp= expression { - match(input,84,FOLLOW_84_in_getStat2920); - pushFollow(FOLLOW_expression_in_getStat2924); + match(input,87,FOLLOW_87_in_getStat3052); + pushFollow(FOLLOW_expression_in_getStat3056); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "operand", temp); @@ -5297,29 +5675,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end getStat + // $ANTLR end "getStat" - // $ANTLR start setStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:569:1: setStat returns [Object ret2] : ( 'set' temp= expression ) ; + // $ANTLR start "setStat" + // ACG_ANTLR3.g:602:1: setStat returns [Object ret2] : ( 'set' temp= expression ) ; public final Object setStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("SetStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SetStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:570:2: ( ( 'set' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:570:4: ( 'set' temp= expression ) + // ACG_ANTLR3.g:603:2: ( ( 'set' temp= expression ) ) + // ACG_ANTLR3.g:603:4: ( 'set' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:570:4: ( 'set' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:570:5: 'set' temp= expression + // ACG_ANTLR3.g:603:4: ( 'set' temp= expression ) + // ACG_ANTLR3.g:603:5: 'set' temp= expression { - match(input,85,FOLLOW_85_in_setStat2958); - pushFollow(FOLLOW_expression_in_setStat2962); + match(input,88,FOLLOW_88_in_setStat3090); + pushFollow(FOLLOW_expression_in_setStat3094); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "operand", temp); @@ -5343,11 +5722,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end setStat + // $ANTLR end "setStat" - // $ANTLR start emitWithLabelRefStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:580:1: emitWithLabelRefStat returns [Object ret2] : ( (ret= gotoStat | ret= ifStat ) ) ; + // $ANTLR start "emitWithLabelRefStat" + // ACG_ANTLR3.g:613:1: emitWithLabelRefStat returns [Object ret2] : ( (ret= gotoStat | ret= ifStat ) ) ; public final Object emitWithLabelRefStat() throws RecognitionException { Object ret2 = null; @@ -5355,17 +5734,17 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:581:2: ( ( (ret= gotoStat | ret= ifStat ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:581:4: ( (ret= gotoStat | ret= ifStat ) ) + // ACG_ANTLR3.g:614:2: ( ( (ret= gotoStat | ret= ifStat ) ) ) + // ACG_ANTLR3.g:614:4: ( (ret= gotoStat | ret= ifStat ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:581:4: ( (ret= gotoStat | ret= ifStat ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:581:5: (ret= gotoStat | ret= ifStat ) + // ACG_ANTLR3.g:614:4: ( (ret= gotoStat | ret= ifStat ) ) + // ACG_ANTLR3.g:614:5: (ret= gotoStat | ret= ifStat ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:581:5: (ret= gotoStat | ret= ifStat ) + // ACG_ANTLR3.g:614:5: (ret= gotoStat | ret= ifStat ) int alt43=2; int LA43_0 = input.LA(1); - if ( (LA43_0==86) ) { + if ( (LA43_0==89) ) { alt43=1; } else if ( (LA43_0==56) ) { @@ -5373,27 +5752,29 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("581:5: (ret= gotoStat | ret= ifStat )", 43, 0, input); + new NoViableAltException("", 43, 0, input); throw nvae; } switch (alt43) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:581:6: ret= gotoStat + // ACG_ANTLR3.g:614:6: ret= gotoStat { - pushFollow(FOLLOW_gotoStat_in_emitWithLabelRefStat2999); + pushFollow(FOLLOW_gotoStat_in_emitWithLabelRefStat3131); ret=gotoStat(); - _fsp--; + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:581:20: ret= ifStat + // ACG_ANTLR3.g:614:20: ret= ifStat { - pushFollow(FOLLOW_ifStat_in_emitWithLabelRefStat3004); + pushFollow(FOLLOW_ifStat_in_emitWithLabelRefStat3136); ret=ifStat(); - _fsp--; + + state._fsp--; } @@ -5420,29 +5801,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end emitWithLabelRefStat + // $ANTLR end "emitWithLabelRefStat" - // $ANTLR start gotoStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:589:1: gotoStat returns [Object ret2] : ( 'goto' temp= identifier ) ; + // $ANTLR start "gotoStat" + // ACG_ANTLR3.g:622:1: gotoStat returns [Object ret2] : ( 'goto' temp= identifier ) ; public final Object gotoStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("GotoStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("GotoStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:590:2: ( ( 'goto' temp= identifier ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:590:4: ( 'goto' temp= identifier ) + // ACG_ANTLR3.g:623:2: ( ( 'goto' temp= identifier ) ) + // ACG_ANTLR3.g:623:4: ( 'goto' temp= identifier ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:590:4: ( 'goto' temp= identifier ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:590:5: 'goto' temp= identifier + // ACG_ANTLR3.g:623:4: ( 'goto' temp= identifier ) + // ACG_ANTLR3.g:623:5: 'goto' temp= identifier { - match(input,86,FOLLOW_86_in_gotoStat3037); - pushFollow(FOLLOW_identifier_in_gotoStat3041); + match(input,89,FOLLOW_89_in_gotoStat3169); + pushFollow(FOLLOW_identifier_in_gotoStat3173); temp=identifier(); - _fsp--; + + state._fsp--; ei.setRef(ret, "label", "LabelStat", "name", temp, null, "never", null, false, null); @@ -5466,29 +5848,30 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end gotoStat + // $ANTLR end "gotoStat" - // $ANTLR start ifStat - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:600:1: ifStat returns [Object ret2] : ( 'if' temp= identifier ) ; + // $ANTLR start "ifStat" + // ACG_ANTLR3.g:633:1: ifStat returns [Object ret2] : ( 'if' temp= identifier ) ; public final Object ifStat() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("IfStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("IfStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:601:2: ( ( 'if' temp= identifier ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:601:4: ( 'if' temp= identifier ) + // ACG_ANTLR3.g:634:2: ( ( 'if' temp= identifier ) ) + // ACG_ANTLR3.g:634:4: ( 'if' temp= identifier ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:601:4: ( 'if' temp= identifier ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:601:5: 'if' temp= identifier + // ACG_ANTLR3.g:634:4: ( 'if' temp= identifier ) + // ACG_ANTLR3.g:634:5: 'if' temp= identifier { - match(input,56,FOLLOW_56_in_ifStat3075); - pushFollow(FOLLOW_identifier_in_ifStat3079); + match(input,56,FOLLOW_56_in_ifStat3207); + pushFollow(FOLLOW_identifier_in_ifStat3211); temp=identifier(); - _fsp--; + + state._fsp--; ei.setRef(ret, "label", "LabelStat", "name", temp, null, "never", null, false, null); @@ -5512,28 +5895,29 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end ifStat + // $ANTLR end "ifStat" - // $ANTLR start variableDecl - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:611:1: variableDecl returns [Object ret2] : (temp= identifier ) ; + // $ANTLR start "variableDecl" + // ACG_ANTLR3.g:644:1: variableDecl returns [Object ret2] : (temp= identifier ) ; public final Object variableDecl() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("VariableDecl", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("VariableDecl", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:612:2: ( (temp= identifier ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:612:4: (temp= identifier ) + // ACG_ANTLR3.g:645:2: ( (temp= identifier ) ) + // ACG_ANTLR3.g:645:4: (temp= identifier ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:612:4: (temp= identifier ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:612:5: temp= identifier + // ACG_ANTLR3.g:645:4: (temp= identifier ) + // ACG_ANTLR3.g:645:5: temp= identifier { - pushFollow(FOLLOW_identifier_in_variableDecl3115); + pushFollow(FOLLOW_identifier_in_variableDecl3247); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); @@ -5557,11 +5941,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end variableDecl + // $ANTLR end "variableDecl" - // $ANTLR start expression - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:622:1: expression returns [Object ret2] : (ret= priority_5 | ret= letExp ) ; + // $ANTLR start "expression" + // ACG_ANTLR3.g:655:1: expression returns [Object ret2] : (ret= priority_5 | ret= letExp ) ; public final Object expression() throws RecognitionException { Object ret2 = null; @@ -5569,14 +5953,14 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:623:2: ( (ret= priority_5 | ret= letExp ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:623:4: (ret= priority_5 | ret= letExp ) + // ACG_ANTLR3.g:656:2: ( (ret= priority_5 | ret= letExp ) ) + // ACG_ANTLR3.g:656:4: (ret= priority_5 | ret= letExp ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:623:4: (ret= priority_5 | ret= letExp ) + // ACG_ANTLR3.g:656:4: (ret= priority_5 | ret= letExp ) int alt44=2; int LA44_0 = input.LA(1); - if ( ((LA44_0>=NAME && LA44_0<=INT)||LA44_0==LPAREN||LA44_0==MINUS||LA44_0==56||(LA44_0>=87 && LA44_0<=88)||(LA44_0>=91 && LA44_0<=95)) ) { + if ( ((LA44_0>=NAME && LA44_0<=INT)||LA44_0==LPAREN||LA44_0==MINUS||LA44_0==56||(LA44_0>=90 && LA44_0<=91)||(LA44_0>=94 && LA44_0<=98)) ) { alt44=1; } else if ( (LA44_0==58) ) { @@ -5584,27 +5968,29 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("623:4: (ret= priority_5 | ret= letExp )", 44, 0, input); + new NoViableAltException("", 44, 0, input); throw nvae; } switch (alt44) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:623:5: ret= priority_5 + // ACG_ANTLR3.g:656:5: ret= priority_5 { - pushFollow(FOLLOW_priority_5_in_expression3151); + pushFollow(FOLLOW_priority_5_in_expression3283); ret=priority_5(); - _fsp--; + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:623:21: ret= letExp + // ACG_ANTLR3.g:656:21: ret= letExp { - pushFollow(FOLLOW_letExp_in_expression3156); + pushFollow(FOLLOW_letExp_in_expression3288); ret=letExp(); - _fsp--; + + state._fsp--; } @@ -5627,28 +6013,29 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end expression + // $ANTLR end "expression" - // $ANTLR start variableExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:630:1: variableExp returns [Object ret2] : (temp= identifier ) ; + // $ANTLR start "variableExp" + // ACG_ANTLR3.g:663:1: variableExp returns [Object ret2] : (temp= identifier ) ; public final Object variableExp() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("VariableExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("VariableExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:631:2: ( (temp= identifier ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:631:4: (temp= identifier ) + // ACG_ANTLR3.g:664:2: ( (temp= identifier ) ) + // ACG_ANTLR3.g:664:4: (temp= identifier ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:631:4: (temp= identifier ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:631:5: temp= identifier + // ACG_ANTLR3.g:664:4: (temp= identifier ) + // ACG_ANTLR3.g:664:5: temp= identifier { - pushFollow(FOLLOW_identifier_in_variableExp3190); + pushFollow(FOLLOW_identifier_in_variableExp3322); temp=identifier(); - _fsp--; + + state._fsp--; ei.setRef(ret, "variable", "VariableDecl", "name", temp, null, "never", null, false, null); @@ -5672,23 +6059,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end variableExp + // $ANTLR end "variableExp" - // $ANTLR start selfExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:641:1: selfExp returns [Object ret2] : ( 'self' ) ; + // $ANTLR start "selfExp" + // ACG_ANTLR3.g:674:1: selfExp returns [Object ret2] : ( 'self' ) ; public final Object selfExp() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("SelfExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SelfExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:642:2: ( ( 'self' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:642:4: ( 'self' ) + // ACG_ANTLR3.g:675:2: ( ( 'self' ) ) + // ACG_ANTLR3.g:675:4: ( 'self' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:642:4: ( 'self' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:642:5: 'self' + // ACG_ANTLR3.g:675:4: ( 'self' ) + // ACG_ANTLR3.g:675:5: 'self' { - match(input,87,FOLLOW_87_in_selfExp3224); + match(input,90,FOLLOW_90_in_selfExp3356); } @@ -5710,23 +6097,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end selfExp + // $ANTLR end "selfExp" - // $ANTLR start lastExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:652:1: lastExp returns [Object ret2] : ( 'last' ) ; + // $ANTLR start "lastExp" + // ACG_ANTLR3.g:685:1: lastExp returns [Object ret2] : ( 'last' ) ; public final Object lastExp() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("LastExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("LastExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:653:2: ( ( 'last' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:653:4: ( 'last' ) + // ACG_ANTLR3.g:686:2: ( ( 'last' ) ) + // ACG_ANTLR3.g:686:4: ( 'last' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:653:4: ( 'last' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:653:5: 'last' + // ACG_ANTLR3.g:686:4: ( 'last' ) + // ACG_ANTLR3.g:686:5: 'last' { - match(input,88,FOLLOW_88_in_lastExp3256); + match(input,91,FOLLOW_91_in_lastExp3388); } @@ -5748,44 +6135,47 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end lastExp + // $ANTLR end "lastExp" - // $ANTLR start ifExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:663:1: ifExp returns [Object ret2] : ( 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' ) ; + // $ANTLR start "ifExp" + // ACG_ANTLR3.g:696:1: ifExp returns [Object ret2] : ( 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' ) ; public final Object ifExp() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("IfExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("IfExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:664:2: ( ( 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:664:4: ( 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' ) + // ACG_ANTLR3.g:697:2: ( ( 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' ) ) + // ACG_ANTLR3.g:697:4: ( 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:664:4: ( 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:664:5: 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' + // ACG_ANTLR3.g:697:4: ( 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' ) + // ACG_ANTLR3.g:697:5: 'if' temp= expression 'then' temp= expression 'else' temp= expression 'endif' { - match(input,56,FOLLOW_56_in_ifExp3288); - pushFollow(FOLLOW_expression_in_ifExp3292); + match(input,56,FOLLOW_56_in_ifExp3420); + pushFollow(FOLLOW_expression_in_ifExp3424); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "condition", temp); - match(input,89,FOLLOW_89_in_ifExp3296); - pushFollow(FOLLOW_expression_in_ifExp3300); + match(input,92,FOLLOW_92_in_ifExp3428); + pushFollow(FOLLOW_expression_in_ifExp3432); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "thenExp", temp); - match(input,57,FOLLOW_57_in_ifExp3304); - pushFollow(FOLLOW_expression_in_ifExp3308); + match(input,57,FOLLOW_57_in_ifExp3436); + pushFollow(FOLLOW_expression_in_ifExp3440); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "elseExp", temp); - match(input,90,FOLLOW_90_in_ifExp3312); + match(input,93,FOLLOW_93_in_ifExp3444); } @@ -5807,28 +6197,29 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end ifExp + // $ANTLR end "ifExp" - // $ANTLR start isAExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:674:1: isAExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifier ) ; + // $ANTLR start "isAExp" + // ACG_ANTLR3.g:707:1: isAExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifier ) ; public final Object isAExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("IsAExp", false, false) : null; + Object ret=(state.backtracking==0) ? ei.create("IsAExp", false, false) : null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:675:2: ( (temp= identifier ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:675:4: (temp= identifier ) + // ACG_ANTLR3.g:708:2: ( (temp= identifier ) ) + // ACG_ANTLR3.g:708:4: (temp= identifier ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:675:4: (temp= identifier ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:675:5: temp= identifier + // ACG_ANTLR3.g:708:4: (temp= identifier ) + // ACG_ANTLR3.g:708:5: temp= identifier { - pushFollow(FOLLOW_identifier_in_isAExp3347); + pushFollow(FOLLOW_identifier_in_isAExp3479); temp=identifier(); - _fsp--; + + state._fsp--; ei.set(ret, "type", temp); @@ -5854,41 +6245,44 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end isAExp + // $ANTLR end "isAExp" - // $ANTLR start letExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:687:1: letExp returns [Object ret2] : ( 'let' temp= variableDecl EQ temp= expression 'in' temp= expression ) ; + // $ANTLR start "letExp" + // ACG_ANTLR3.g:720:1: letExp returns [Object ret2] : ( 'let' temp= variableDecl EQ temp= expression 'in' temp= expression ) ; public final Object letExp() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("LetExp", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("LetExp", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:688:2: ( ( 'let' temp= variableDecl EQ temp= expression 'in' temp= expression ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:688:4: ( 'let' temp= variableDecl EQ temp= expression 'in' temp= expression ) + // ACG_ANTLR3.g:721:2: ( ( 'let' temp= variableDecl EQ temp= expression 'in' temp= expression ) ) + // ACG_ANTLR3.g:721:4: ( 'let' temp= variableDecl EQ temp= expression 'in' temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:688:4: ( 'let' temp= variableDecl EQ temp= expression 'in' temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:688:5: 'let' temp= variableDecl EQ temp= expression 'in' temp= expression + // ACG_ANTLR3.g:721:4: ( 'let' temp= variableDecl EQ temp= expression 'in' temp= expression ) + // ACG_ANTLR3.g:721:5: 'let' temp= variableDecl EQ temp= expression 'in' temp= expression { - match(input,58,FOLLOW_58_in_letExp3381); - pushFollow(FOLLOW_variableDecl_in_letExp3385); + match(input,58,FOLLOW_58_in_letExp3513); + pushFollow(FOLLOW_variableDecl_in_letExp3517); temp=variableDecl(); - _fsp--; + + state._fsp--; ei.set(ret, "variable", temp); - match(input,EQ,FOLLOW_EQ_in_letExp3389); - pushFollow(FOLLOW_expression_in_letExp3393); + match(input,EQ,FOLLOW_EQ_in_letExp3521); + pushFollow(FOLLOW_expression_in_letExp3525); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "value", temp); - match(input,51,FOLLOW_51_in_letExp3397); - pushFollow(FOLLOW_expression_in_letExp3401); + match(input,51,FOLLOW_51_in_letExp3529); + pushFollow(FOLLOW_expression_in_letExp3533); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "in", temp); @@ -5912,28 +6306,29 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end letExp + // $ANTLR end "letExp" - // $ANTLR start navigationExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:698:1: navigationExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifierOrKeyword ) ; + // $ANTLR start "navigationExp" + // ACG_ANTLR3.g:731:1: navigationExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifierOrKeyword ) ; public final Object navigationExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("NavigationExp", false, false) : null; + Object ret=(state.backtracking==0) ? ei.create("NavigationExp", false, false) : null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:699:2: ( (temp= identifierOrKeyword ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:699:4: (temp= identifierOrKeyword ) + // ACG_ANTLR3.g:732:2: ( (temp= identifierOrKeyword ) ) + // ACG_ANTLR3.g:732:4: (temp= identifierOrKeyword ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:699:4: (temp= identifierOrKeyword ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:699:5: temp= identifierOrKeyword + // ACG_ANTLR3.g:732:4: (temp= identifierOrKeyword ) + // ACG_ANTLR3.g:732:5: temp= identifierOrKeyword { - pushFollow(FOLLOW_identifierOrKeyword_in_navigationExp3438); + pushFollow(FOLLOW_identifierOrKeyword_in_navigationExp3570); temp=identifierOrKeyword(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); @@ -5959,43 +6354,46 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end navigationExp + // $ANTLR end "navigationExp" - // $ANTLR start iteratorExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:711:1: iteratorExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN ) ; + // $ANTLR start "iteratorExp" + // ACG_ANTLR3.g:744:1: iteratorExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN ) ; public final Object iteratorExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("IteratorExp", true, false) : null; + Object ret=(state.backtracking==0) ? ei.create("IteratorExp", true, false) : null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:712:2: ( (temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:712:4: (temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN ) + // ACG_ANTLR3.g:745:2: ( (temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN ) ) + // ACG_ANTLR3.g:745:4: (temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:712:4: (temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:712:5: temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN + // ACG_ANTLR3.g:745:4: (temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN ) + // ACG_ANTLR3.g:745:5: temp= identifierOrKeyword LPAREN temp= variableDecl PIPE temp= expression RPAREN { - pushFollow(FOLLOW_identifierOrKeyword_in_iteratorExp3475); + pushFollow(FOLLOW_identifierOrKeyword_in_iteratorExp3607); temp=identifierOrKeyword(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - match(input,LPAREN,FOLLOW_LPAREN_in_iteratorExp3479); - pushFollow(FOLLOW_variableDecl_in_iteratorExp3483); + match(input,LPAREN,FOLLOW_LPAREN_in_iteratorExp3611); + pushFollow(FOLLOW_variableDecl_in_iteratorExp3615); temp=variableDecl(); - _fsp--; + + state._fsp--; ei.set(ret, "iterator", temp); - match(input,PIPE,FOLLOW_PIPE_in_iteratorExp3487); - pushFollow(FOLLOW_expression_in_iteratorExp3491); + match(input,PIPE,FOLLOW_PIPE_in_iteratorExp3619); + pushFollow(FOLLOW_expression_in_iteratorExp3623); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "body", temp); - match(input,RPAREN,FOLLOW_RPAREN_in_iteratorExp3495); + match(input,RPAREN,FOLLOW_RPAREN_in_iteratorExp3627); } @@ -6019,51 +6417,53 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end iteratorExp + // $ANTLR end "iteratorExp" - // $ANTLR start operationCallExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:724:1: operationCallExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN ) ; + // $ANTLR start "operationCallExp" + // ACG_ANTLR3.g:757:1: operationCallExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN ) ; public final Object operationCallExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("OperationCallExp", false, false) : null; + Object ret=(state.backtracking==0) ? ei.create("OperationCallExp", false, false) : null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:2: ( (temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:4: (temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN ) + // ACG_ANTLR3.g:758:2: ( (temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN ) ) + // ACG_ANTLR3.g:758:4: (temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:4: (temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:5: temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN + // ACG_ANTLR3.g:758:4: (temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN ) + // ACG_ANTLR3.g:758:5: temp= identifierOrKeyword LPAREN ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RPAREN { - pushFollow(FOLLOW_identifierOrKeyword_in_operationCallExp3530); + pushFollow(FOLLOW_identifierOrKeyword_in_operationCallExp3662); temp=identifierOrKeyword(); - _fsp--; + + state._fsp--; ei.set(ret, "name", temp); - match(input,LPAREN,FOLLOW_LPAREN_in_operationCallExp3534); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:66: ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? + match(input,LPAREN,FOLLOW_LPAREN_in_operationCallExp3666); + // ACG_ANTLR3.g:758:66: ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? int alt46=2; int LA46_0 = input.LA(1); - if ( ((LA46_0>=NAME && LA46_0<=INT)||LA46_0==LPAREN||LA46_0==MINUS||LA46_0==56||LA46_0==58||(LA46_0>=87 && LA46_0<=88)||(LA46_0>=91 && LA46_0<=95)) ) { + if ( ((LA46_0>=NAME && LA46_0<=INT)||LA46_0==LPAREN||LA46_0==MINUS||LA46_0==56||LA46_0==58||(LA46_0>=90 && LA46_0<=91)||(LA46_0>=94 && LA46_0<=98)) ) { alt46=1; } switch (alt46) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:67: (temp= expression ( ( ( COMA ) temp= expression ) )* ) + // ACG_ANTLR3.g:758:67: (temp= expression ( ( ( COMA ) temp= expression ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:67: (temp= expression ( ( ( COMA ) temp= expression ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:68: temp= expression ( ( ( COMA ) temp= expression ) )* + // ACG_ANTLR3.g:758:67: (temp= expression ( ( ( COMA ) temp= expression ) )* ) + // ACG_ANTLR3.g:758:68: temp= expression ( ( ( COMA ) temp= expression ) )* { - pushFollow(FOLLOW_expression_in_operationCallExp3540); + pushFollow(FOLLOW_expression_in_operationCallExp3672); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:118: ( ( ( COMA ) temp= expression ) )* + // ACG_ANTLR3.g:758:118: ( ( ( COMA ) temp= expression ) )* loop45: do { int alt45=2; @@ -6076,21 +6476,22 @@ public class ACG_ANTLR3Parser extends Parser { switch (alt45) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:119: ( ( COMA ) temp= expression ) + // ACG_ANTLR3.g:758:119: ( ( COMA ) temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:119: ( ( COMA ) temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:120: ( COMA ) temp= expression + // ACG_ANTLR3.g:758:119: ( ( COMA ) temp= expression ) + // ACG_ANTLR3.g:758:120: ( COMA ) temp= expression { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:120: ( COMA ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:725:121: COMA + // ACG_ANTLR3.g:758:120: ( COMA ) + // ACG_ANTLR3.g:758:121: COMA { - match(input,COMA,FOLLOW_COMA_in_operationCallExp3547); + match(input,COMA,FOLLOW_COMA_in_operationCallExp3679); } - pushFollow(FOLLOW_expression_in_operationCallExp3552); + pushFollow(FOLLOW_expression_in_operationCallExp3684); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", temp); @@ -6114,7 +6515,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_operationCallExp3562); + match(input,RPAREN,FOLLOW_RPAREN_in_operationCallExp3694); } @@ -6138,18 +6539,18 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end operationCallExp + // $ANTLR end "operationCallExp" - // $ANTLR start operatorCallExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:737:1: operatorCallExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : ; + // $ANTLR start "operatorCallExp" + // ACG_ANTLR3.g:770:1: operatorCallExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : ; public final Object operatorCallExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("OperatorCallExp", false, false) : null; + Object ret=(state.backtracking==0) ? ei.create("OperatorCallExp", false, false) : null; try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:738:2: () - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:739:9: + // ACG_ANTLR3.g:771:2: () + // ACG_ANTLR3.g:772:9: { ei.set(ret, "name", opName); @@ -6166,11 +6567,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end operatorCallExp + // $ANTLR end "operatorCallExp" - // $ANTLR start literalExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:749:1: literalExp returns [Object ret2] : ( (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) ) ; + // $ANTLR start "literalExp" + // ACG_ANTLR3.g:782:1: literalExp returns [Object ret2] : ( (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) ) ; public final Object literalExp() throws RecognitionException { Object ret2 = null; @@ -6178,27 +6579,27 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:2: ( ( (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:4: ( (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) ) + // ACG_ANTLR3.g:783:2: ( ( (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) ) ) + // ACG_ANTLR3.g:783:4: ( (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:4: ( (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:5: (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) + // ACG_ANTLR3.g:783:4: ( (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) ) + // ACG_ANTLR3.g:783:5: (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:5: (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) + // ACG_ANTLR3.g:783:5: (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp ) int alt47=5; switch ( input.LA(1) ) { - case 91: + case 94: { alt47=1; } break; - case 92: + case 95: { alt47=2; } break; - case 93: - case 94: + case 96: + case 97: { alt47=3; } @@ -6215,58 +6616,63 @@ public class ACG_ANTLR3Parser extends Parser { break; default: NoViableAltException nvae = - new NoViableAltException("750:5: (ret= oclUndefinedExp | ret= collectionExp | ret= booleanExp | ret= integerExp | ret= stringExp )", 47, 0, input); + new NoViableAltException("", 47, 0, input); throw nvae; } switch (alt47) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:6: ret= oclUndefinedExp + // ACG_ANTLR3.g:783:6: ret= oclUndefinedExp { - pushFollow(FOLLOW_oclUndefinedExp_in_literalExp3626); + pushFollow(FOLLOW_oclUndefinedExp_in_literalExp3758); ret=oclUndefinedExp(); - _fsp--; + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:27: ret= collectionExp + // ACG_ANTLR3.g:783:27: ret= collectionExp { - pushFollow(FOLLOW_collectionExp_in_literalExp3631); + pushFollow(FOLLOW_collectionExp_in_literalExp3763); ret=collectionExp(); - _fsp--; + + state._fsp--; } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:46: ret= booleanExp + // ACG_ANTLR3.g:783:46: ret= booleanExp { - pushFollow(FOLLOW_booleanExp_in_literalExp3636); + pushFollow(FOLLOW_booleanExp_in_literalExp3768); ret=booleanExp(); - _fsp--; + + state._fsp--; } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:62: ret= integerExp + // ACG_ANTLR3.g:783:62: ret= integerExp { - pushFollow(FOLLOW_integerExp_in_literalExp3641); + pushFollow(FOLLOW_integerExp_in_literalExp3773); ret=integerExp(); - _fsp--; + + state._fsp--; } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:750:78: ret= stringExp + // ACG_ANTLR3.g:783:78: ret= stringExp { - pushFollow(FOLLOW_stringExp_in_literalExp3646); + pushFollow(FOLLOW_stringExp_in_literalExp3778); ret=stringExp(); - _fsp--; + + state._fsp--; } @@ -6293,23 +6699,23 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end literalExp + // $ANTLR end "literalExp" - // $ANTLR start oclUndefinedExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:758:1: oclUndefinedExp returns [Object ret2] : ( 'OclUndefined' ) ; + // $ANTLR start "oclUndefinedExp" + // ACG_ANTLR3.g:791:1: oclUndefinedExp returns [Object ret2] : ( 'OclUndefined' ) ; public final Object oclUndefinedExp() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("OclUndefinedExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OclUndefinedExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:759:2: ( ( 'OclUndefined' ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:759:4: ( 'OclUndefined' ) + // ACG_ANTLR3.g:792:2: ( ( 'OclUndefined' ) ) + // ACG_ANTLR3.g:792:4: ( 'OclUndefined' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:759:4: ( 'OclUndefined' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:759:5: 'OclUndefined' + // ACG_ANTLR3.g:792:4: ( 'OclUndefined' ) + // ACG_ANTLR3.g:792:5: 'OclUndefined' { - match(input,91,FOLLOW_91_in_oclUndefinedExp3679); + match(input,94,FOLLOW_94_in_oclUndefinedExp3811); } @@ -6331,11 +6737,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclUndefinedExp + // $ANTLR end "oclUndefinedExp" - // $ANTLR start collectionExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:769:1: collectionExp returns [Object ret2] : (ret= sequenceExp ) ; + // $ANTLR start "collectionExp" + // ACG_ANTLR3.g:802:1: collectionExp returns [Object ret2] : (ret= sequenceExp ) ; public final Object collectionExp() throws RecognitionException { Object ret2 = null; @@ -6343,15 +6749,16 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:770:2: ( (ret= sequenceExp ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:770:4: (ret= sequenceExp ) + // ACG_ANTLR3.g:803:2: ( (ret= sequenceExp ) ) + // ACG_ANTLR3.g:803:4: (ret= sequenceExp ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:770:4: (ret= sequenceExp ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:770:5: ret= sequenceExp + // ACG_ANTLR3.g:803:4: (ret= sequenceExp ) + // ACG_ANTLR3.g:803:5: ret= sequenceExp { - pushFollow(FOLLOW_sequenceExp_in_collectionExp3713); + pushFollow(FOLLOW_sequenceExp_in_collectionExp3845); ret=sequenceExp(); - _fsp--; + + state._fsp--; } @@ -6372,47 +6779,48 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end collectionExp + // $ANTLR end "collectionExp" - // $ANTLR start sequenceExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:778:1: sequenceExp returns [Object ret2] : ( 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY ) ; + // $ANTLR start "sequenceExp" + // ACG_ANTLR3.g:811:1: sequenceExp returns [Object ret2] : ( 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY ) ; public final Object sequenceExp() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("SequenceExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SequenceExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:2: ( ( 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:4: ( 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY ) + // ACG_ANTLR3.g:812:2: ( ( 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY ) ) + // ACG_ANTLR3.g:812:4: ( 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:4: ( 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:5: 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY + // ACG_ANTLR3.g:812:4: ( 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY ) + // ACG_ANTLR3.g:812:5: 'Sequence' LCURLY ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? RCURLY { - match(input,92,FOLLOW_92_in_sequenceExp3745); - match(input,LCURLY,FOLLOW_LCURLY_in_sequenceExp3747); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:23: ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? + match(input,95,FOLLOW_95_in_sequenceExp3877); + match(input,LCURLY,FOLLOW_LCURLY_in_sequenceExp3879); + // ACG_ANTLR3.g:812:23: ( (temp= expression ( ( ( COMA ) temp= expression ) )* ) )? int alt49=2; int LA49_0 = input.LA(1); - if ( ((LA49_0>=NAME && LA49_0<=INT)||LA49_0==LPAREN||LA49_0==MINUS||LA49_0==56||LA49_0==58||(LA49_0>=87 && LA49_0<=88)||(LA49_0>=91 && LA49_0<=95)) ) { + if ( ((LA49_0>=NAME && LA49_0<=INT)||LA49_0==LPAREN||LA49_0==MINUS||LA49_0==56||LA49_0==58||(LA49_0>=90 && LA49_0<=91)||(LA49_0>=94 && LA49_0<=98)) ) { alt49=1; } switch (alt49) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:24: (temp= expression ( ( ( COMA ) temp= expression ) )* ) + // ACG_ANTLR3.g:812:24: (temp= expression ( ( ( COMA ) temp= expression ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:24: (temp= expression ( ( ( COMA ) temp= expression ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:25: temp= expression ( ( ( COMA ) temp= expression ) )* + // ACG_ANTLR3.g:812:24: (temp= expression ( ( ( COMA ) temp= expression ) )* ) + // ACG_ANTLR3.g:812:25: temp= expression ( ( ( COMA ) temp= expression ) )* { - pushFollow(FOLLOW_expression_in_sequenceExp3753); + pushFollow(FOLLOW_expression_in_sequenceExp3885); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "elements", temp); - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:74: ( ( ( COMA ) temp= expression ) )* + // ACG_ANTLR3.g:812:74: ( ( ( COMA ) temp= expression ) )* loop48: do { int alt48=2; @@ -6425,21 +6833,22 @@ public class ACG_ANTLR3Parser extends Parser { switch (alt48) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:75: ( ( COMA ) temp= expression ) + // ACG_ANTLR3.g:812:75: ( ( COMA ) temp= expression ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:75: ( ( COMA ) temp= expression ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:76: ( COMA ) temp= expression + // ACG_ANTLR3.g:812:75: ( ( COMA ) temp= expression ) + // ACG_ANTLR3.g:812:76: ( COMA ) temp= expression { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:76: ( COMA ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:779:77: COMA + // ACG_ANTLR3.g:812:76: ( COMA ) + // ACG_ANTLR3.g:812:77: COMA { - match(input,COMA,FOLLOW_COMA_in_sequenceExp3760); + match(input,COMA,FOLLOW_COMA_in_sequenceExp3892); } - pushFollow(FOLLOW_expression_in_sequenceExp3765); + pushFollow(FOLLOW_expression_in_sequenceExp3897); temp=expression(); - _fsp--; + + state._fsp--; ei.set(ret, "elements", temp); @@ -6463,7 +6872,7 @@ public class ACG_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_sequenceExp3775); + match(input,RCURLY,FOLLOW_RCURLY_in_sequenceExp3907); } @@ -6485,46 +6894,46 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end sequenceExp + // $ANTLR end "sequenceExp" - // $ANTLR start booleanExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:789:1: booleanExp returns [Object ret2] : ( ( ( 'true' ) | ( 'false' ) ) ) ; + // $ANTLR start "booleanExp" + // ACG_ANTLR3.g:822:1: booleanExp returns [Object ret2] : ( ( ( 'true' ) | ( 'false' ) ) ) ; public final Object booleanExp() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("BooleanExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("BooleanExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:2: ( ( ( ( 'true' ) | ( 'false' ) ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:4: ( ( ( 'true' ) | ( 'false' ) ) ) + // ACG_ANTLR3.g:823:2: ( ( ( ( 'true' ) | ( 'false' ) ) ) ) + // ACG_ANTLR3.g:823:4: ( ( ( 'true' ) | ( 'false' ) ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:4: ( ( ( 'true' ) | ( 'false' ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:5: ( ( 'true' ) | ( 'false' ) ) + // ACG_ANTLR3.g:823:4: ( ( ( 'true' ) | ( 'false' ) ) ) + // ACG_ANTLR3.g:823:5: ( ( 'true' ) | ( 'false' ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:5: ( ( 'true' ) | ( 'false' ) ) + // ACG_ANTLR3.g:823:5: ( ( 'true' ) | ( 'false' ) ) int alt50=2; int LA50_0 = input.LA(1); - if ( (LA50_0==93) ) { + if ( (LA50_0==96) ) { alt50=1; } - else if ( (LA50_0==94) ) { + else if ( (LA50_0==97) ) { alt50=2; } else { NoViableAltException nvae = - new NoViableAltException("790:5: ( ( 'true' ) | ( 'false' ) )", 50, 0, input); + new NoViableAltException("", 50, 0, input); throw nvae; } switch (alt50) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:6: ( 'true' ) + // ACG_ANTLR3.g:823:6: ( 'true' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:6: ( 'true' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:7: 'true' + // ACG_ANTLR3.g:823:6: ( 'true' ) + // ACG_ANTLR3.g:823:7: 'true' { - match(input,93,FOLLOW_93_in_booleanExp3809); + match(input,96,FOLLOW_96_in_booleanExp3941); } @@ -6533,12 +6942,12 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:64: ( 'false' ) + // ACG_ANTLR3.g:823:64: ( 'false' ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:64: ( 'false' ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:790:65: 'false' + // ACG_ANTLR3.g:823:64: ( 'false' ) + // ACG_ANTLR3.g:823:65: 'false' { - match(input,94,FOLLOW_94_in_booleanExp3816); + match(input,97,FOLLOW_97_in_booleanExp3948); } @@ -6570,28 +6979,29 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end booleanExp + // $ANTLR end "booleanExp" - // $ANTLR start integerExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:800:1: integerExp returns [Object ret2] : (temp= integerSymbol ) ; + // $ANTLR start "integerExp" + // ACG_ANTLR3.g:833:1: integerExp returns [Object ret2] : (temp= integerSymbol ) ; public final Object integerExp() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("IntegerExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("IntegerExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:801:2: ( (temp= integerSymbol ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:801:4: (temp= integerSymbol ) + // ACG_ANTLR3.g:834:2: ( (temp= integerSymbol ) ) + // ACG_ANTLR3.g:834:4: (temp= integerSymbol ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:801:4: (temp= integerSymbol ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:801:5: temp= integerSymbol + // ACG_ANTLR3.g:834:4: (temp= integerSymbol ) + // ACG_ANTLR3.g:834:5: temp= integerSymbol { - pushFollow(FOLLOW_integerSymbol_in_integerExp3854); + pushFollow(FOLLOW_integerSymbol_in_integerExp3986); temp=integerSymbol(); - _fsp--; + + state._fsp--; ei.set(ret, "value", temp); @@ -6615,28 +7025,29 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end integerExp + // $ANTLR end "integerExp" - // $ANTLR start stringExp - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:811:1: stringExp returns [Object ret2] : (temp= stringSymbol ) ; + // $ANTLR start "stringExp" + // ACG_ANTLR3.g:844:1: stringExp returns [Object ret2] : (temp= stringSymbol ) ; public final Object stringExp() throws RecognitionException { Object ret2 = null; Object temp = null; - Object ret=(backtracking==0) ? ei.create("StringExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("StringExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:812:2: ( (temp= stringSymbol ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:812:4: (temp= stringSymbol ) + // ACG_ANTLR3.g:845:2: ( (temp= stringSymbol ) ) + // ACG_ANTLR3.g:845:4: (temp= stringSymbol ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:812:4: (temp= stringSymbol ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:812:5: temp= stringSymbol + // ACG_ANTLR3.g:845:4: (temp= stringSymbol ) + // ACG_ANTLR3.g:845:5: temp= stringSymbol { - pushFollow(FOLLOW_stringSymbol_in_stringExp3890); + pushFollow(FOLLOW_stringSymbol_in_stringExp4022); temp=stringSymbol(); - _fsp--; + + state._fsp--; ei.set(ret, "value", temp); @@ -6660,11 +7071,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end stringExp + // $ANTLR end "stringExp" - // $ANTLR start priority_0 - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:822:1: priority_0 returns [Object ret2] : (ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* ) ; + // $ANTLR start "priority_0" + // ACG_ANTLR3.g:855:1: priority_0 returns [Object ret2] : (ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* ) ; public final Object priority_0() throws RecognitionException { Object ret2 = null; @@ -6673,17 +7084,18 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.String opName=null; org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:2: ( (ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:4: (ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* ) + // ACG_ANTLR3.g:856:2: ( (ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* ) ) + // ACG_ANTLR3.g:856:4: (ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:4: (ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:5: ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* + // ACG_ANTLR3.g:856:4: (ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* ) + // ACG_ANTLR3.g:856:5: ret= primary_expression ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* { - pushFollow(FOLLOW_primary_expression_in_priority_03926); + pushFollow(FOLLOW_primary_expression_in_priority_04058); ret=primary_expression(); - _fsp--; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:28: ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* + state._fsp--; + + // ACG_ANTLR3.g:856:28: ( ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) )* loop53: do { int alt53=2; @@ -6696,9 +7108,9 @@ public class ACG_ANTLR3Parser extends Parser { switch (alt53) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:29: ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) + // ACG_ANTLR3.g:856:29: ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:29: ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) + // ACG_ANTLR3.g:856:29: ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) ) int alt52=2; int LA52_0 = input.LA(1); @@ -6710,1162 +7122,41 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("823:29: ( ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) | ( RARROW ret= iteratorExp[opName, ret, firstToken] ) )", 52, 0, input); + new NoViableAltException("", 52, 0, input); throw nvae; } switch (alt52) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:30: ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) + // ACG_ANTLR3.g:856:30: ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:30: ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:31: POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) + // ACG_ANTLR3.g:856:30: ( POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) ) + // ACG_ANTLR3.g:856:31: POINT (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) { - match(input,POINT,FOLLOW_POINT_in_priority_03931); + match(input,POINT,FOLLOW_POINT_in_priority_04063); opName = "."; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) + // ACG_ANTLR3.g:856:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] ) int alt51=2; - switch ( input.LA(1) ) { - case NAME: - { - int LA51_1 = input.LA(2); - - if ( (LA51_1==NAME||(LA51_1>=LCURLY && LA51_1<=RCURLY)||(LA51_1>=COMA && LA51_1<=SEMI)||(LA51_1>=LSQUARE && LA51_1<=NE)||LA51_1==47||(LA51_1>=49 && LA51_1<=54)||(LA51_1>=56 && LA51_1<=60)||(LA51_1>=64 && LA51_1<=86)||(LA51_1>=89 && LA51_1<=90)||(LA51_1>=96 && LA51_1<=102)) ) { - alt51=1; - } - else if ( (LA51_1==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 1, input); - - throw nvae; - } - } - break; - case 42: - { - int LA51_2 = input.LA(2); - - if ( (LA51_2==LPAREN) ) { - alt51=2; - } - else if ( (LA51_2==NAME||(LA51_2>=LCURLY && LA51_2<=RCURLY)||(LA51_2>=COMA && LA51_2<=SEMI)||(LA51_2>=LSQUARE && LA51_2<=NE)||LA51_2==47||(LA51_2>=49 && LA51_2<=54)||(LA51_2>=56 && LA51_2<=60)||(LA51_2>=64 && LA51_2<=86)||(LA51_2>=89 && LA51_2<=90)||(LA51_2>=96 && LA51_2<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 2, input); - - throw nvae; - } - } - break; - case 43: - { - int LA51_3 = input.LA(2); - - if ( (LA51_3==LPAREN) ) { - alt51=2; - } - else if ( (LA51_3==NAME||(LA51_3>=LCURLY && LA51_3<=RCURLY)||(LA51_3>=COMA && LA51_3<=SEMI)||(LA51_3>=LSQUARE && LA51_3<=NE)||LA51_3==47||(LA51_3>=49 && LA51_3<=54)||(LA51_3>=56 && LA51_3<=60)||(LA51_3>=64 && LA51_3<=86)||(LA51_3>=89 && LA51_3<=90)||(LA51_3>=96 && LA51_3<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 3, input); - - throw nvae; - } - } - break; - case 44: - { - int LA51_4 = input.LA(2); - - if ( (LA51_4==LPAREN) ) { - alt51=2; - } - else if ( (LA51_4==NAME||(LA51_4>=LCURLY && LA51_4<=RCURLY)||(LA51_4>=COMA && LA51_4<=SEMI)||(LA51_4>=LSQUARE && LA51_4<=NE)||LA51_4==47||(LA51_4>=49 && LA51_4<=54)||(LA51_4>=56 && LA51_4<=60)||(LA51_4>=64 && LA51_4<=86)||(LA51_4>=89 && LA51_4<=90)||(LA51_4>=96 && LA51_4<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 4, input); - - throw nvae; - } - } - break; - case 45: - { - int LA51_5 = input.LA(2); - - if ( (LA51_5==NAME||(LA51_5>=LCURLY && LA51_5<=RCURLY)||(LA51_5>=COMA && LA51_5<=SEMI)||(LA51_5>=LSQUARE && LA51_5<=NE)||LA51_5==47||(LA51_5>=49 && LA51_5<=54)||(LA51_5>=56 && LA51_5<=60)||(LA51_5>=64 && LA51_5<=86)||(LA51_5>=89 && LA51_5<=90)||(LA51_5>=96 && LA51_5<=102)) ) { - alt51=1; - } - else if ( (LA51_5==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 5, input); - - throw nvae; - } - } - break; - case 46: - { - int LA51_6 = input.LA(2); - - if ( (LA51_6==NAME||(LA51_6>=LCURLY && LA51_6<=RCURLY)||(LA51_6>=COMA && LA51_6<=SEMI)||(LA51_6>=LSQUARE && LA51_6<=NE)||LA51_6==47||(LA51_6>=49 && LA51_6<=54)||(LA51_6>=56 && LA51_6<=60)||(LA51_6>=64 && LA51_6<=86)||(LA51_6>=89 && LA51_6<=90)||(LA51_6>=96 && LA51_6<=102)) ) { - alt51=1; - } - else if ( (LA51_6==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 6, input); - - throw nvae; - } - } - break; - case 47: - { - int LA51_7 = input.LA(2); - - if ( (LA51_7==LPAREN) ) { - alt51=2; - } - else if ( (LA51_7==NAME||(LA51_7>=LCURLY && LA51_7<=RCURLY)||(LA51_7>=COMA && LA51_7<=SEMI)||(LA51_7>=LSQUARE && LA51_7<=NE)||LA51_7==47||(LA51_7>=49 && LA51_7<=54)||(LA51_7>=56 && LA51_7<=60)||(LA51_7>=64 && LA51_7<=86)||(LA51_7>=89 && LA51_7<=90)||(LA51_7>=96 && LA51_7<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 7, input); - - throw nvae; - } - } - break; - case 48: - { - int LA51_8 = input.LA(2); - - if ( (LA51_8==NAME||(LA51_8>=LCURLY && LA51_8<=RCURLY)||(LA51_8>=COMA && LA51_8<=SEMI)||(LA51_8>=LSQUARE && LA51_8<=NE)||LA51_8==47||(LA51_8>=49 && LA51_8<=54)||(LA51_8>=56 && LA51_8<=60)||(LA51_8>=64 && LA51_8<=86)||(LA51_8>=89 && LA51_8<=90)||(LA51_8>=96 && LA51_8<=102)) ) { - alt51=1; - } - else if ( (LA51_8==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 8, input); - - throw nvae; - } - } - break; - case 49: - { - int LA51_9 = input.LA(2); - - if ( (LA51_9==NAME||(LA51_9>=LCURLY && LA51_9<=RCURLY)||(LA51_9>=COMA && LA51_9<=SEMI)||(LA51_9>=LSQUARE && LA51_9<=NE)||LA51_9==47||(LA51_9>=49 && LA51_9<=54)||(LA51_9>=56 && LA51_9<=60)||(LA51_9>=64 && LA51_9<=86)||(LA51_9>=89 && LA51_9<=90)||(LA51_9>=96 && LA51_9<=102)) ) { - alt51=1; - } - else if ( (LA51_9==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 9, input); - - throw nvae; - } - } - break; - case 50: - { - int LA51_10 = input.LA(2); - - if ( (LA51_10==LPAREN) ) { - alt51=2; - } - else if ( (LA51_10==NAME||(LA51_10>=LCURLY && LA51_10<=RCURLY)||(LA51_10>=COMA && LA51_10<=SEMI)||(LA51_10>=LSQUARE && LA51_10<=NE)||LA51_10==47||(LA51_10>=49 && LA51_10<=54)||(LA51_10>=56 && LA51_10<=60)||(LA51_10>=64 && LA51_10<=86)||(LA51_10>=89 && LA51_10<=90)||(LA51_10>=96 && LA51_10<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 10, input); - - throw nvae; - } - } - break; - case 51: - { - int LA51_11 = input.LA(2); - - if ( (LA51_11==LPAREN) ) { - alt51=2; - } - else if ( (LA51_11==NAME||(LA51_11>=LCURLY && LA51_11<=RCURLY)||(LA51_11>=COMA && LA51_11<=SEMI)||(LA51_11>=LSQUARE && LA51_11<=NE)||LA51_11==47||(LA51_11>=49 && LA51_11<=54)||(LA51_11>=56 && LA51_11<=60)||(LA51_11>=64 && LA51_11<=86)||(LA51_11>=89 && LA51_11<=90)||(LA51_11>=96 && LA51_11<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 11, input); - - throw nvae; - } - } - break; - case 52: - { - int LA51_12 = input.LA(2); - - if ( (LA51_12==NAME||(LA51_12>=LCURLY && LA51_12<=RCURLY)||(LA51_12>=COMA && LA51_12<=SEMI)||(LA51_12>=LSQUARE && LA51_12<=NE)||LA51_12==47||(LA51_12>=49 && LA51_12<=54)||(LA51_12>=56 && LA51_12<=60)||(LA51_12>=64 && LA51_12<=86)||(LA51_12>=89 && LA51_12<=90)||(LA51_12>=96 && LA51_12<=102)) ) { - alt51=1; - } - else if ( (LA51_12==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 12, input); - - throw nvae; - } - } - break; - case 53: - { - int LA51_13 = input.LA(2); - - if ( (LA51_13==NAME||(LA51_13>=LCURLY && LA51_13<=RCURLY)||(LA51_13>=COMA && LA51_13<=SEMI)||(LA51_13>=LSQUARE && LA51_13<=NE)||LA51_13==47||(LA51_13>=49 && LA51_13<=54)||(LA51_13>=56 && LA51_13<=60)||(LA51_13>=64 && LA51_13<=86)||(LA51_13>=89 && LA51_13<=90)||(LA51_13>=96 && LA51_13<=102)) ) { - alt51=1; - } - else if ( (LA51_13==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 13, input); - - throw nvae; - } - } - break; - case 54: - { - int LA51_14 = input.LA(2); - - if ( (LA51_14==NAME||(LA51_14>=LCURLY && LA51_14<=RCURLY)||(LA51_14>=COMA && LA51_14<=SEMI)||(LA51_14>=LSQUARE && LA51_14<=NE)||LA51_14==47||(LA51_14>=49 && LA51_14<=54)||(LA51_14>=56 && LA51_14<=60)||(LA51_14>=64 && LA51_14<=86)||(LA51_14>=89 && LA51_14<=90)||(LA51_14>=96 && LA51_14<=102)) ) { - alt51=1; - } - else if ( (LA51_14==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 14, input); - - throw nvae; - } - } - break; - case 55: - { - int LA51_15 = input.LA(2); - - if ( (LA51_15==LPAREN) ) { - alt51=2; - } - else if ( (LA51_15==NAME||(LA51_15>=LCURLY && LA51_15<=RCURLY)||(LA51_15>=COMA && LA51_15<=SEMI)||(LA51_15>=LSQUARE && LA51_15<=NE)||LA51_15==47||(LA51_15>=49 && LA51_15<=54)||(LA51_15>=56 && LA51_15<=60)||(LA51_15>=64 && LA51_15<=86)||(LA51_15>=89 && LA51_15<=90)||(LA51_15>=96 && LA51_15<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 15, input); - - throw nvae; - } - } - break; - case 56: - { - int LA51_16 = input.LA(2); - - if ( (LA51_16==NAME||(LA51_16>=LCURLY && LA51_16<=RCURLY)||(LA51_16>=COMA && LA51_16<=SEMI)||(LA51_16>=LSQUARE && LA51_16<=NE)||LA51_16==47||(LA51_16>=49 && LA51_16<=54)||(LA51_16>=56 && LA51_16<=60)||(LA51_16>=64 && LA51_16<=86)||(LA51_16>=89 && LA51_16<=90)||(LA51_16>=96 && LA51_16<=102)) ) { - alt51=1; - } - else if ( (LA51_16==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 16, input); - - throw nvae; - } - } - break; - case 57: - { - int LA51_17 = input.LA(2); - - if ( (LA51_17==NAME||(LA51_17>=LCURLY && LA51_17<=RCURLY)||(LA51_17>=COMA && LA51_17<=SEMI)||(LA51_17>=LSQUARE && LA51_17<=NE)||LA51_17==47||(LA51_17>=49 && LA51_17<=54)||(LA51_17>=56 && LA51_17<=60)||(LA51_17>=64 && LA51_17<=86)||(LA51_17>=89 && LA51_17<=90)||(LA51_17>=96 && LA51_17<=102)) ) { - alt51=1; - } - else if ( (LA51_17==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 17, input); - - throw nvae; - } - } - break; - case 58: - { - int LA51_18 = input.LA(2); - - if ( (LA51_18==LPAREN) ) { - alt51=2; - } - else if ( (LA51_18==NAME||(LA51_18>=LCURLY && LA51_18<=RCURLY)||(LA51_18>=COMA && LA51_18<=SEMI)||(LA51_18>=LSQUARE && LA51_18<=NE)||LA51_18==47||(LA51_18>=49 && LA51_18<=54)||(LA51_18>=56 && LA51_18<=60)||(LA51_18>=64 && LA51_18<=86)||(LA51_18>=89 && LA51_18<=90)||(LA51_18>=96 && LA51_18<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 18, input); - - throw nvae; - } - } - break; - case 59: - { - int LA51_19 = input.LA(2); - - if ( (LA51_19==LPAREN) ) { - alt51=2; - } - else if ( (LA51_19==NAME||(LA51_19>=LCURLY && LA51_19<=RCURLY)||(LA51_19>=COMA && LA51_19<=SEMI)||(LA51_19>=LSQUARE && LA51_19<=NE)||LA51_19==47||(LA51_19>=49 && LA51_19<=54)||(LA51_19>=56 && LA51_19<=60)||(LA51_19>=64 && LA51_19<=86)||(LA51_19>=89 && LA51_19<=90)||(LA51_19>=96 && LA51_19<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 19, input); - - throw nvae; - } - } - break; - case 60: - { - int LA51_20 = input.LA(2); - - if ( (LA51_20==NAME||(LA51_20>=LCURLY && LA51_20<=RCURLY)||(LA51_20>=COMA && LA51_20<=SEMI)||(LA51_20>=LSQUARE && LA51_20<=NE)||LA51_20==47||(LA51_20>=49 && LA51_20<=54)||(LA51_20>=56 && LA51_20<=60)||(LA51_20>=64 && LA51_20<=86)||(LA51_20>=89 && LA51_20<=90)||(LA51_20>=96 && LA51_20<=102)) ) { - alt51=1; - } - else if ( (LA51_20==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 20, input); - - throw nvae; - } - } - break; - case 61: - { - int LA51_21 = input.LA(2); - - if ( (LA51_21==NAME||(LA51_21>=LCURLY && LA51_21<=RCURLY)||(LA51_21>=COMA && LA51_21<=SEMI)||(LA51_21>=LSQUARE && LA51_21<=NE)||LA51_21==47||(LA51_21>=49 && LA51_21<=54)||(LA51_21>=56 && LA51_21<=60)||(LA51_21>=64 && LA51_21<=86)||(LA51_21>=89 && LA51_21<=90)||(LA51_21>=96 && LA51_21<=102)) ) { - alt51=1; - } - else if ( (LA51_21==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 21, input); - - throw nvae; - } - } - break; - case 62: - { - int LA51_22 = input.LA(2); - - if ( (LA51_22==NAME||(LA51_22>=LCURLY && LA51_22<=RCURLY)||(LA51_22>=COMA && LA51_22<=SEMI)||(LA51_22>=LSQUARE && LA51_22<=NE)||LA51_22==47||(LA51_22>=49 && LA51_22<=54)||(LA51_22>=56 && LA51_22<=60)||(LA51_22>=64 && LA51_22<=86)||(LA51_22>=89 && LA51_22<=90)||(LA51_22>=96 && LA51_22<=102)) ) { - alt51=1; - } - else if ( (LA51_22==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 22, input); - - throw nvae; - } - } - break; - case 63: - { - int LA51_23 = input.LA(2); - - if ( (LA51_23==LPAREN) ) { - alt51=2; - } - else if ( (LA51_23==NAME||(LA51_23>=LCURLY && LA51_23<=RCURLY)||(LA51_23>=COMA && LA51_23<=SEMI)||(LA51_23>=LSQUARE && LA51_23<=NE)||LA51_23==47||(LA51_23>=49 && LA51_23<=54)||(LA51_23>=56 && LA51_23<=60)||(LA51_23>=64 && LA51_23<=86)||(LA51_23>=89 && LA51_23<=90)||(LA51_23>=96 && LA51_23<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 23, input); - - throw nvae; - } - } - break; - case 64: - { - int LA51_24 = input.LA(2); - - if ( (LA51_24==LPAREN) ) { - alt51=2; - } - else if ( (LA51_24==NAME||(LA51_24>=LCURLY && LA51_24<=RCURLY)||(LA51_24>=COMA && LA51_24<=SEMI)||(LA51_24>=LSQUARE && LA51_24<=NE)||LA51_24==47||(LA51_24>=49 && LA51_24<=54)||(LA51_24>=56 && LA51_24<=60)||(LA51_24>=64 && LA51_24<=86)||(LA51_24>=89 && LA51_24<=90)||(LA51_24>=96 && LA51_24<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 24, input); - - throw nvae; - } - } - break; - case 65: - { - int LA51_25 = input.LA(2); - - if ( (LA51_25==LPAREN) ) { - alt51=2; - } - else if ( (LA51_25==NAME||(LA51_25>=LCURLY && LA51_25<=RCURLY)||(LA51_25>=COMA && LA51_25<=SEMI)||(LA51_25>=LSQUARE && LA51_25<=NE)||LA51_25==47||(LA51_25>=49 && LA51_25<=54)||(LA51_25>=56 && LA51_25<=60)||(LA51_25>=64 && LA51_25<=86)||(LA51_25>=89 && LA51_25<=90)||(LA51_25>=96 && LA51_25<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 25, input); - - throw nvae; - } - } - break; - case 66: - { - int LA51_26 = input.LA(2); - - if ( (LA51_26==LPAREN) ) { - alt51=2; - } - else if ( (LA51_26==NAME||(LA51_26>=LCURLY && LA51_26<=RCURLY)||(LA51_26>=COMA && LA51_26<=SEMI)||(LA51_26>=LSQUARE && LA51_26<=NE)||LA51_26==47||(LA51_26>=49 && LA51_26<=54)||(LA51_26>=56 && LA51_26<=60)||(LA51_26>=64 && LA51_26<=86)||(LA51_26>=89 && LA51_26<=90)||(LA51_26>=96 && LA51_26<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 26, input); - - throw nvae; - } - } - break; - case 67: - { - int LA51_27 = input.LA(2); - - if ( (LA51_27==LPAREN) ) { - alt51=2; - } - else if ( (LA51_27==NAME||(LA51_27>=LCURLY && LA51_27<=RCURLY)||(LA51_27>=COMA && LA51_27<=SEMI)||(LA51_27>=LSQUARE && LA51_27<=NE)||LA51_27==47||(LA51_27>=49 && LA51_27<=54)||(LA51_27>=56 && LA51_27<=60)||(LA51_27>=64 && LA51_27<=86)||(LA51_27>=89 && LA51_27<=90)||(LA51_27>=96 && LA51_27<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 27, input); - - throw nvae; - } - } - break; - case 68: - { - int LA51_28 = input.LA(2); - - if ( (LA51_28==LPAREN) ) { - alt51=2; - } - else if ( (LA51_28==NAME||(LA51_28>=LCURLY && LA51_28<=RCURLY)||(LA51_28>=COMA && LA51_28<=SEMI)||(LA51_28>=LSQUARE && LA51_28<=NE)||LA51_28==47||(LA51_28>=49 && LA51_28<=54)||(LA51_28>=56 && LA51_28<=60)||(LA51_28>=64 && LA51_28<=86)||(LA51_28>=89 && LA51_28<=90)||(LA51_28>=96 && LA51_28<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 28, input); - - throw nvae; - } - } - break; - case 69: - { - int LA51_29 = input.LA(2); - - if ( (LA51_29==LPAREN) ) { - alt51=2; - } - else if ( (LA51_29==NAME||(LA51_29>=LCURLY && LA51_29<=RCURLY)||(LA51_29>=COMA && LA51_29<=SEMI)||(LA51_29>=LSQUARE && LA51_29<=NE)||LA51_29==47||(LA51_29>=49 && LA51_29<=54)||(LA51_29>=56 && LA51_29<=60)||(LA51_29>=64 && LA51_29<=86)||(LA51_29>=89 && LA51_29<=90)||(LA51_29>=96 && LA51_29<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 29, input); - - throw nvae; - } - } - break; - case 70: - { - int LA51_30 = input.LA(2); - - if ( (LA51_30==NAME||(LA51_30>=LCURLY && LA51_30<=RCURLY)||(LA51_30>=COMA && LA51_30<=SEMI)||(LA51_30>=LSQUARE && LA51_30<=NE)||LA51_30==47||(LA51_30>=49 && LA51_30<=54)||(LA51_30>=56 && LA51_30<=60)||(LA51_30>=64 && LA51_30<=86)||(LA51_30>=89 && LA51_30<=90)||(LA51_30>=96 && LA51_30<=102)) ) { - alt51=1; - } - else if ( (LA51_30==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 30, input); - - throw nvae; - } - } - break; - case 71: - { - int LA51_31 = input.LA(2); - - if ( (LA51_31==NAME||(LA51_31>=LCURLY && LA51_31<=RCURLY)||(LA51_31>=COMA && LA51_31<=SEMI)||(LA51_31>=LSQUARE && LA51_31<=NE)||LA51_31==47||(LA51_31>=49 && LA51_31<=54)||(LA51_31>=56 && LA51_31<=60)||(LA51_31>=64 && LA51_31<=86)||(LA51_31>=89 && LA51_31<=90)||(LA51_31>=96 && LA51_31<=102)) ) { - alt51=1; - } - else if ( (LA51_31==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 31, input); - - throw nvae; - } - } - break; - case 72: - { - int LA51_32 = input.LA(2); - - if ( (LA51_32==NAME||(LA51_32>=LCURLY && LA51_32<=RCURLY)||(LA51_32>=COMA && LA51_32<=SEMI)||(LA51_32>=LSQUARE && LA51_32<=NE)||LA51_32==47||(LA51_32>=49 && LA51_32<=54)||(LA51_32>=56 && LA51_32<=60)||(LA51_32>=64 && LA51_32<=86)||(LA51_32>=89 && LA51_32<=90)||(LA51_32>=96 && LA51_32<=102)) ) { - alt51=1; - } - else if ( (LA51_32==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 32, input); - - throw nvae; - } - } - break; - case 73: - { - int LA51_33 = input.LA(2); - - if ( (LA51_33==NAME||(LA51_33>=LCURLY && LA51_33<=RCURLY)||(LA51_33>=COMA && LA51_33<=SEMI)||(LA51_33>=LSQUARE && LA51_33<=NE)||LA51_33==47||(LA51_33>=49 && LA51_33<=54)||(LA51_33>=56 && LA51_33<=60)||(LA51_33>=64 && LA51_33<=86)||(LA51_33>=89 && LA51_33<=90)||(LA51_33>=96 && LA51_33<=102)) ) { - alt51=1; - } - else if ( (LA51_33==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 33, input); - - throw nvae; - } - } - break; - case 74: - { - int LA51_34 = input.LA(2); - - if ( (LA51_34==LPAREN) ) { - alt51=2; - } - else if ( (LA51_34==NAME||(LA51_34>=LCURLY && LA51_34<=RCURLY)||(LA51_34>=COMA && LA51_34<=SEMI)||(LA51_34>=LSQUARE && LA51_34<=NE)||LA51_34==47||(LA51_34>=49 && LA51_34<=54)||(LA51_34>=56 && LA51_34<=60)||(LA51_34>=64 && LA51_34<=86)||(LA51_34>=89 && LA51_34<=90)||(LA51_34>=96 && LA51_34<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 34, input); - - throw nvae; - } - } - break; - case 75: - { - int LA51_35 = input.LA(2); - - if ( (LA51_35==LPAREN) ) { - alt51=2; - } - else if ( (LA51_35==NAME||(LA51_35>=LCURLY && LA51_35<=RCURLY)||(LA51_35>=COMA && LA51_35<=SEMI)||(LA51_35>=LSQUARE && LA51_35<=NE)||LA51_35==47||(LA51_35>=49 && LA51_35<=54)||(LA51_35>=56 && LA51_35<=60)||(LA51_35>=64 && LA51_35<=86)||(LA51_35>=89 && LA51_35<=90)||(LA51_35>=96 && LA51_35<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 35, input); - - throw nvae; - } - } - break; - case 76: - { - int LA51_36 = input.LA(2); - - if ( (LA51_36==LPAREN) ) { - alt51=2; - } - else if ( (LA51_36==NAME||(LA51_36>=LCURLY && LA51_36<=RCURLY)||(LA51_36>=COMA && LA51_36<=SEMI)||(LA51_36>=LSQUARE && LA51_36<=NE)||LA51_36==47||(LA51_36>=49 && LA51_36<=54)||(LA51_36>=56 && LA51_36<=60)||(LA51_36>=64 && LA51_36<=86)||(LA51_36>=89 && LA51_36<=90)||(LA51_36>=96 && LA51_36<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 36, input); - - throw nvae; - } - } - break; - case 77: - { - int LA51_37 = input.LA(2); - - if ( (LA51_37==LPAREN) ) { - alt51=2; - } - else if ( (LA51_37==NAME||(LA51_37>=LCURLY && LA51_37<=RCURLY)||(LA51_37>=COMA && LA51_37<=SEMI)||(LA51_37>=LSQUARE && LA51_37<=NE)||LA51_37==47||(LA51_37>=49 && LA51_37<=54)||(LA51_37>=56 && LA51_37<=60)||(LA51_37>=64 && LA51_37<=86)||(LA51_37>=89 && LA51_37<=90)||(LA51_37>=96 && LA51_37<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 37, input); - - throw nvae; - } - } - break; - case 78: - { - int LA51_38 = input.LA(2); - - if ( (LA51_38==LPAREN) ) { - alt51=2; - } - else if ( (LA51_38==NAME||(LA51_38>=LCURLY && LA51_38<=RCURLY)||(LA51_38>=COMA && LA51_38<=SEMI)||(LA51_38>=LSQUARE && LA51_38<=NE)||LA51_38==47||(LA51_38>=49 && LA51_38<=54)||(LA51_38>=56 && LA51_38<=60)||(LA51_38>=64 && LA51_38<=86)||(LA51_38>=89 && LA51_38<=90)||(LA51_38>=96 && LA51_38<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 38, input); - - throw nvae; - } - } - break; - case 79: - { - int LA51_39 = input.LA(2); - - if ( (LA51_39==NAME||(LA51_39>=LCURLY && LA51_39<=RCURLY)||(LA51_39>=COMA && LA51_39<=SEMI)||(LA51_39>=LSQUARE && LA51_39<=NE)||LA51_39==47||(LA51_39>=49 && LA51_39<=54)||(LA51_39>=56 && LA51_39<=60)||(LA51_39>=64 && LA51_39<=86)||(LA51_39>=89 && LA51_39<=90)||(LA51_39>=96 && LA51_39<=102)) ) { - alt51=1; - } - else if ( (LA51_39==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 39, input); - - throw nvae; - } - } - break; - case 80: - { - int LA51_40 = input.LA(2); - - if ( (LA51_40==NAME||(LA51_40>=LCURLY && LA51_40<=RCURLY)||(LA51_40>=COMA && LA51_40<=SEMI)||(LA51_40>=LSQUARE && LA51_40<=NE)||LA51_40==47||(LA51_40>=49 && LA51_40<=54)||(LA51_40>=56 && LA51_40<=60)||(LA51_40>=64 && LA51_40<=86)||(LA51_40>=89 && LA51_40<=90)||(LA51_40>=96 && LA51_40<=102)) ) { - alt51=1; - } - else if ( (LA51_40==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 40, input); - - throw nvae; - } - } - break; - case 81: - { - int LA51_41 = input.LA(2); - - if ( (LA51_41==NAME||(LA51_41>=LCURLY && LA51_41<=RCURLY)||(LA51_41>=COMA && LA51_41<=SEMI)||(LA51_41>=LSQUARE && LA51_41<=NE)||LA51_41==47||(LA51_41>=49 && LA51_41<=54)||(LA51_41>=56 && LA51_41<=60)||(LA51_41>=64 && LA51_41<=86)||(LA51_41>=89 && LA51_41<=90)||(LA51_41>=96 && LA51_41<=102)) ) { - alt51=1; - } - else if ( (LA51_41==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 41, input); - - throw nvae; - } - } - break; - case 82: - { - int LA51_42 = input.LA(2); - - if ( (LA51_42==NAME||(LA51_42>=LCURLY && LA51_42<=RCURLY)||(LA51_42>=COMA && LA51_42<=SEMI)||(LA51_42>=LSQUARE && LA51_42<=NE)||LA51_42==47||(LA51_42>=49 && LA51_42<=54)||(LA51_42>=56 && LA51_42<=60)||(LA51_42>=64 && LA51_42<=86)||(LA51_42>=89 && LA51_42<=90)||(LA51_42>=96 && LA51_42<=102)) ) { - alt51=1; - } - else if ( (LA51_42==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 42, input); - - throw nvae; - } - } - break; - case 83: - { - int LA51_43 = input.LA(2); - - if ( (LA51_43==LPAREN) ) { - alt51=2; - } - else if ( (LA51_43==NAME||(LA51_43>=LCURLY && LA51_43<=RCURLY)||(LA51_43>=COMA && LA51_43<=SEMI)||(LA51_43>=LSQUARE && LA51_43<=NE)||LA51_43==47||(LA51_43>=49 && LA51_43<=54)||(LA51_43>=56 && LA51_43<=60)||(LA51_43>=64 && LA51_43<=86)||(LA51_43>=89 && LA51_43<=90)||(LA51_43>=96 && LA51_43<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 43, input); - - throw nvae; - } - } - break; - case 84: - { - int LA51_44 = input.LA(2); - - if ( (LA51_44==LPAREN) ) { - alt51=2; - } - else if ( (LA51_44==NAME||(LA51_44>=LCURLY && LA51_44<=RCURLY)||(LA51_44>=COMA && LA51_44<=SEMI)||(LA51_44>=LSQUARE && LA51_44<=NE)||LA51_44==47||(LA51_44>=49 && LA51_44<=54)||(LA51_44>=56 && LA51_44<=60)||(LA51_44>=64 && LA51_44<=86)||(LA51_44>=89 && LA51_44<=90)||(LA51_44>=96 && LA51_44<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 44, input); - - throw nvae; - } - } - break; - case 85: - { - int LA51_45 = input.LA(2); - - if ( (LA51_45==LPAREN) ) { - alt51=2; - } - else if ( (LA51_45==NAME||(LA51_45>=LCURLY && LA51_45<=RCURLY)||(LA51_45>=COMA && LA51_45<=SEMI)||(LA51_45>=LSQUARE && LA51_45<=NE)||LA51_45==47||(LA51_45>=49 && LA51_45<=54)||(LA51_45>=56 && LA51_45<=60)||(LA51_45>=64 && LA51_45<=86)||(LA51_45>=89 && LA51_45<=90)||(LA51_45>=96 && LA51_45<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 45, input); - - throw nvae; - } - } - break; - case 86: - { - int LA51_46 = input.LA(2); - - if ( (LA51_46==LPAREN) ) { - alt51=2; - } - else if ( (LA51_46==NAME||(LA51_46>=LCURLY && LA51_46<=RCURLY)||(LA51_46>=COMA && LA51_46<=SEMI)||(LA51_46>=LSQUARE && LA51_46<=NE)||LA51_46==47||(LA51_46>=49 && LA51_46<=54)||(LA51_46>=56 && LA51_46<=60)||(LA51_46>=64 && LA51_46<=86)||(LA51_46>=89 && LA51_46<=90)||(LA51_46>=96 && LA51_46<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 46, input); - - throw nvae; - } - } - break; - case 87: - { - int LA51_47 = input.LA(2); - - if ( (LA51_47==NAME||(LA51_47>=LCURLY && LA51_47<=RCURLY)||(LA51_47>=COMA && LA51_47<=SEMI)||(LA51_47>=LSQUARE && LA51_47<=NE)||LA51_47==47||(LA51_47>=49 && LA51_47<=54)||(LA51_47>=56 && LA51_47<=60)||(LA51_47>=64 && LA51_47<=86)||(LA51_47>=89 && LA51_47<=90)||(LA51_47>=96 && LA51_47<=102)) ) { - alt51=1; - } - else if ( (LA51_47==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 47, input); - - throw nvae; - } - } - break; - case 88: - { - int LA51_48 = input.LA(2); - - if ( (LA51_48==NAME||(LA51_48>=LCURLY && LA51_48<=RCURLY)||(LA51_48>=COMA && LA51_48<=SEMI)||(LA51_48>=LSQUARE && LA51_48<=NE)||LA51_48==47||(LA51_48>=49 && LA51_48<=54)||(LA51_48>=56 && LA51_48<=60)||(LA51_48>=64 && LA51_48<=86)||(LA51_48>=89 && LA51_48<=90)||(LA51_48>=96 && LA51_48<=102)) ) { - alt51=1; - } - else if ( (LA51_48==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 48, input); - - throw nvae; - } - } - break; - case 89: - { - int LA51_49 = input.LA(2); - - if ( (LA51_49==NAME||(LA51_49>=LCURLY && LA51_49<=RCURLY)||(LA51_49>=COMA && LA51_49<=SEMI)||(LA51_49>=LSQUARE && LA51_49<=NE)||LA51_49==47||(LA51_49>=49 && LA51_49<=54)||(LA51_49>=56 && LA51_49<=60)||(LA51_49>=64 && LA51_49<=86)||(LA51_49>=89 && LA51_49<=90)||(LA51_49>=96 && LA51_49<=102)) ) { - alt51=1; - } - else if ( (LA51_49==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 49, input); - - throw nvae; - } - } - break; - case 90: - { - int LA51_50 = input.LA(2); - - if ( (LA51_50==NAME||(LA51_50>=LCURLY && LA51_50<=RCURLY)||(LA51_50>=COMA && LA51_50<=SEMI)||(LA51_50>=LSQUARE && LA51_50<=NE)||LA51_50==47||(LA51_50>=49 && LA51_50<=54)||(LA51_50>=56 && LA51_50<=60)||(LA51_50>=64 && LA51_50<=86)||(LA51_50>=89 && LA51_50<=90)||(LA51_50>=96 && LA51_50<=102)) ) { - alt51=1; - } - else if ( (LA51_50==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 50, input); - - throw nvae; - } - } - break; - case 91: - { - int LA51_51 = input.LA(2); - - if ( (LA51_51==LPAREN) ) { - alt51=2; - } - else if ( (LA51_51==NAME||(LA51_51>=LCURLY && LA51_51<=RCURLY)||(LA51_51>=COMA && LA51_51<=SEMI)||(LA51_51>=LSQUARE && LA51_51<=NE)||LA51_51==47||(LA51_51>=49 && LA51_51<=54)||(LA51_51>=56 && LA51_51<=60)||(LA51_51>=64 && LA51_51<=86)||(LA51_51>=89 && LA51_51<=90)||(LA51_51>=96 && LA51_51<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 51, input); - - throw nvae; - } - } - break; - case 92: - { - int LA51_52 = input.LA(2); - - if ( (LA51_52==LPAREN) ) { - alt51=2; - } - else if ( (LA51_52==NAME||(LA51_52>=LCURLY && LA51_52<=RCURLY)||(LA51_52>=COMA && LA51_52<=SEMI)||(LA51_52>=LSQUARE && LA51_52<=NE)||LA51_52==47||(LA51_52>=49 && LA51_52<=54)||(LA51_52>=56 && LA51_52<=60)||(LA51_52>=64 && LA51_52<=86)||(LA51_52>=89 && LA51_52<=90)||(LA51_52>=96 && LA51_52<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 52, input); - - throw nvae; - } - } - break; - case 93: - { - int LA51_53 = input.LA(2); - - if ( (LA51_53==LPAREN) ) { - alt51=2; - } - else if ( (LA51_53==NAME||(LA51_53>=LCURLY && LA51_53<=RCURLY)||(LA51_53>=COMA && LA51_53<=SEMI)||(LA51_53>=LSQUARE && LA51_53<=NE)||LA51_53==47||(LA51_53>=49 && LA51_53<=54)||(LA51_53>=56 && LA51_53<=60)||(LA51_53>=64 && LA51_53<=86)||(LA51_53>=89 && LA51_53<=90)||(LA51_53>=96 && LA51_53<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 53, input); - - throw nvae; - } - } - break; - case 94: - { - int LA51_54 = input.LA(2); - - if ( (LA51_54==LPAREN) ) { - alt51=2; - } - else if ( (LA51_54==NAME||(LA51_54>=LCURLY && LA51_54<=RCURLY)||(LA51_54>=COMA && LA51_54<=SEMI)||(LA51_54>=LSQUARE && LA51_54<=NE)||LA51_54==47||(LA51_54>=49 && LA51_54<=54)||(LA51_54>=56 && LA51_54<=60)||(LA51_54>=64 && LA51_54<=86)||(LA51_54>=89 && LA51_54<=90)||(LA51_54>=96 && LA51_54<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 54, input); - - throw nvae; - } - } - break; - case 95: - { - int LA51_55 = input.LA(2); - - if ( (LA51_55==LPAREN) ) { - alt51=2; - } - else if ( (LA51_55==NAME||(LA51_55>=LCURLY && LA51_55<=RCURLY)||(LA51_55>=COMA && LA51_55<=SEMI)||(LA51_55>=LSQUARE && LA51_55<=NE)||LA51_55==47||(LA51_55>=49 && LA51_55<=54)||(LA51_55>=56 && LA51_55<=60)||(LA51_55>=64 && LA51_55<=86)||(LA51_55>=89 && LA51_55<=90)||(LA51_55>=96 && LA51_55<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 55, input); - - throw nvae; - } - } - break; - case 96: - { - int LA51_56 = input.LA(2); - - if ( (LA51_56==NAME||(LA51_56>=LCURLY && LA51_56<=RCURLY)||(LA51_56>=COMA && LA51_56<=SEMI)||(LA51_56>=LSQUARE && LA51_56<=NE)||LA51_56==47||(LA51_56>=49 && LA51_56<=54)||(LA51_56>=56 && LA51_56<=60)||(LA51_56>=64 && LA51_56<=86)||(LA51_56>=89 && LA51_56<=90)||(LA51_56>=96 && LA51_56<=102)) ) { - alt51=1; - } - else if ( (LA51_56==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 56, input); - - throw nvae; - } - } - break; - case 97: - { - int LA51_57 = input.LA(2); - - if ( (LA51_57==LPAREN) ) { - alt51=2; - } - else if ( (LA51_57==NAME||(LA51_57>=LCURLY && LA51_57<=RCURLY)||(LA51_57>=COMA && LA51_57<=SEMI)||(LA51_57>=LSQUARE && LA51_57<=NE)||LA51_57==47||(LA51_57>=49 && LA51_57<=54)||(LA51_57>=56 && LA51_57<=60)||(LA51_57>=64 && LA51_57<=86)||(LA51_57>=89 && LA51_57<=90)||(LA51_57>=96 && LA51_57<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 57, input); - - throw nvae; - } - } - break; - case 98: - { - int LA51_58 = input.LA(2); - - if ( (LA51_58==NAME||(LA51_58>=LCURLY && LA51_58<=RCURLY)||(LA51_58>=COMA && LA51_58<=SEMI)||(LA51_58>=LSQUARE && LA51_58<=NE)||LA51_58==47||(LA51_58>=49 && LA51_58<=54)||(LA51_58>=56 && LA51_58<=60)||(LA51_58>=64 && LA51_58<=86)||(LA51_58>=89 && LA51_58<=90)||(LA51_58>=96 && LA51_58<=102)) ) { - alt51=1; - } - else if ( (LA51_58==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 58, input); - - throw nvae; - } - } - break; - case 99: - { - int LA51_59 = input.LA(2); - - if ( (LA51_59==LPAREN) ) { - alt51=2; - } - else if ( (LA51_59==NAME||(LA51_59>=LCURLY && LA51_59<=RCURLY)||(LA51_59>=COMA && LA51_59<=SEMI)||(LA51_59>=LSQUARE && LA51_59<=NE)||LA51_59==47||(LA51_59>=49 && LA51_59<=54)||(LA51_59>=56 && LA51_59<=60)||(LA51_59>=64 && LA51_59<=86)||(LA51_59>=89 && LA51_59<=90)||(LA51_59>=96 && LA51_59<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 59, input); - - throw nvae; - } - } - break; - case 100: - { - int LA51_60 = input.LA(2); - - if ( (LA51_60==NAME||(LA51_60>=LCURLY && LA51_60<=RCURLY)||(LA51_60>=COMA && LA51_60<=SEMI)||(LA51_60>=LSQUARE && LA51_60<=NE)||LA51_60==47||(LA51_60>=49 && LA51_60<=54)||(LA51_60>=56 && LA51_60<=60)||(LA51_60>=64 && LA51_60<=86)||(LA51_60>=89 && LA51_60<=90)||(LA51_60>=96 && LA51_60<=102)) ) { - alt51=1; - } - else if ( (LA51_60==LPAREN) ) { - alt51=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 60, input); - - throw nvae; - } - } - break; - case 101: - { - int LA51_61 = input.LA(2); - - if ( (LA51_61==LPAREN) ) { - alt51=2; - } - else if ( (LA51_61==NAME||(LA51_61>=LCURLY && LA51_61<=RCURLY)||(LA51_61>=COMA && LA51_61<=SEMI)||(LA51_61>=LSQUARE && LA51_61<=NE)||LA51_61==47||(LA51_61>=49 && LA51_61<=54)||(LA51_61>=56 && LA51_61<=60)||(LA51_61>=64 && LA51_61<=86)||(LA51_61>=89 && LA51_61<=90)||(LA51_61>=96 && LA51_61<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 61, input); - - throw nvae; - } - } - break; - case 102: - { - int LA51_62 = input.LA(2); - - if ( (LA51_62==LPAREN) ) { - alt51=2; - } - else if ( (LA51_62==NAME||(LA51_62>=LCURLY && LA51_62<=RCURLY)||(LA51_62>=COMA && LA51_62<=SEMI)||(LA51_62>=LSQUARE && LA51_62<=NE)||LA51_62==47||(LA51_62>=49 && LA51_62<=54)||(LA51_62>=56 && LA51_62<=60)||(LA51_62>=64 && LA51_62<=86)||(LA51_62>=89 && LA51_62<=90)||(LA51_62>=96 && LA51_62<=102)) ) { - alt51=1; - } - else { - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 62, input); - - throw nvae; - } - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("823:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )", 51, 0, input); - - throw nvae; - } - + alt51 = dfa51.predict(input); switch (alt51) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:54: ret= navigationExp[opName, ret, firstToken] + // ACG_ANTLR3.g:856:54: ret= navigationExp[opName, ret, firstToken] { - pushFollow(FOLLOW_navigationExp_in_priority_03938); - ret=navigationExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_navigationExp_in_priority_04070); + ret=navigationExp(opName, ret, firstToken); + + state._fsp--; } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:99: ret= operationCallExp[opName, ret, firstToken] + // ACG_ANTLR3.g:856:99: ret= operationCallExp[opName, ret, firstToken] { - pushFollow(FOLLOW_operationCallExp_in_priority_03945); - ret=operationCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operationCallExp_in_priority_04077); + ret=operationCallExp(opName, ret, firstToken); + + state._fsp--; } @@ -7880,16 +7171,17 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:149: ( RARROW ret= iteratorExp[opName, ret, firstToken] ) + // ACG_ANTLR3.g:856:149: ( RARROW ret= iteratorExp[opName, ret, firstToken] ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:149: ( RARROW ret= iteratorExp[opName, ret, firstToken] ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:823:150: RARROW ret= iteratorExp[opName, ret, firstToken] + // ACG_ANTLR3.g:856:149: ( RARROW ret= iteratorExp[opName, ret, firstToken] ) + // ACG_ANTLR3.g:856:150: RARROW ret= iteratorExp[opName, ret, firstToken] { - match(input,RARROW,FOLLOW_RARROW_in_priority_03953); + match(input,RARROW,FOLLOW_RARROW_in_priority_04085); opName = "->"; - pushFollow(FOLLOW_iteratorExp_in_priority_03959); - ret=iteratorExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_iteratorExp_in_priority_04091); + ret=iteratorExp(opName, ret, firstToken); + + state._fsp--; } @@ -7927,11 +7219,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_0 + // $ANTLR end "priority_0" - // $ANTLR start priority_1 - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:830:1: priority_1 returns [Object ret2] : ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) ) ; + // $ANTLR start "priority_1" + // ACG_ANTLR3.g:863:1: priority_1 returns [Object ret2] : ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) ) ; public final Object priority_1() throws RecognitionException { Object ret2 = null; @@ -7942,13 +7234,13 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.String opName=null; org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:831:2: ( ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:831:4: ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) ) + // ACG_ANTLR3.g:864:2: ( ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) ) ) + // ACG_ANTLR3.g:864:4: ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:831:4: ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) ) + // ACG_ANTLR3.g:864:4: ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) ) int alt54=3; switch ( input.LA(1) ) { - case 95: + case 98: { alt54=1; } @@ -7963,42 +7255,44 @@ public class ACG_ANTLR3Parser extends Parser { case INT: case LPAREN: case 56: - case 87: - case 88: + case 90: case 91: - case 92: - case 93: case 94: + case 95: + case 96: + case 97: { alt54=3; } break; default: NoViableAltException nvae = - new NoViableAltException("831:4: ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) )", 54, 0, input); + new NoViableAltException("", 54, 0, input); throw nvae; } switch (alt54) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:831:5: ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) + // ACG_ANTLR3.g:864:5: ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:831:5: ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:831:6: 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) + // ACG_ANTLR3.g:864:5: ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) + // ACG_ANTLR3.g:864:6: 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) { - match(input,95,FOLLOW_95_in_priority_13998); + match(input,98,FOLLOW_98_in_priority_14130); opName = "not"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:831:30: (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:831:31: ret= operatorCallExp[opName, right, firstToken] right= priority_0 + // ACG_ANTLR3.g:864:30: (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) + // ACG_ANTLR3.g:864:31: ret= operatorCallExp[opName, right, firstToken] right= priority_0 { - pushFollow(FOLLOW_operatorCallExp_in_priority_14005); - ret=operatorCallExp(opName, right, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_14137); + ret=operatorCallExp(opName, right, firstToken); + + state._fsp--; - pushFollow(FOLLOW_priority_0_in_priority_14010); + pushFollow(FOLLOW_priority_0_in_priority_14142); right=priority_0(); - _fsp--; + + state._fsp--; ei.set(ret, "source", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8012,23 +7306,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:832:71: ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) + // ACG_ANTLR3.g:865:71: ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:832:71: ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:832:72: MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) + // ACG_ANTLR3.g:865:71: ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) + // ACG_ANTLR3.g:865:72: MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) { - match(input,MINUS,FOLLOW_MINUS_in_priority_14018); + match(input,MINUS,FOLLOW_MINUS_in_priority_14150); opName = "-"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:832:94: (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:832:95: ret= operatorCallExp[opName, right, firstToken] right= priority_0 + // ACG_ANTLR3.g:865:94: (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) + // ACG_ANTLR3.g:865:95: ret= operatorCallExp[opName, right, firstToken] right= priority_0 { - pushFollow(FOLLOW_operatorCallExp_in_priority_14025); - ret=operatorCallExp(opName, right, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_14157); + ret=operatorCallExp(opName, right, firstToken); + + state._fsp--; - pushFollow(FOLLOW_priority_0_in_priority_14030); + pushFollow(FOLLOW_priority_0_in_priority_14162); right=priority_0(); - _fsp--; + + state._fsp--; ei.set(ret, "source", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8042,14 +7338,15 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:833:71: (ret= priority_0 ) + // ACG_ANTLR3.g:866:71: (ret= priority_0 ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:833:71: (ret= priority_0 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:833:72: ret= priority_0 + // ACG_ANTLR3.g:866:71: (ret= priority_0 ) + // ACG_ANTLR3.g:866:72: ret= priority_0 { - pushFollow(FOLLOW_priority_0_in_priority_14040); + pushFollow(FOLLOW_priority_0_in_priority_14172); ret=priority_0(); - _fsp--; + + state._fsp--; } @@ -8075,11 +7372,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_1 + // $ANTLR end "priority_1" - // $ANTLR start priority_2 - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:840:1: priority_2 returns [Object ret2] : (ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* ) ; + // $ANTLR start "priority_2" + // ACG_ANTLR3.g:873:1: priority_2 returns [Object ret2] : (ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* ) ; public final Object priority_2() throws RecognitionException { Object ret2 = null; @@ -8090,32 +7387,33 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.String opName=null; org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:2: ( (ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:4: (ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* ) + // ACG_ANTLR3.g:874:2: ( (ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* ) ) + // ACG_ANTLR3.g:874:4: (ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:4: (ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:5: ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* + // ACG_ANTLR3.g:874:4: (ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* ) + // ACG_ANTLR3.g:874:5: ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* { - pushFollow(FOLLOW_priority_1_in_priority_24075); + pushFollow(FOLLOW_priority_1_in_priority_24207); ret=priority_1(); - _fsp--; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:20: ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* + state._fsp--; + + // ACG_ANTLR3.g:874:20: ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* loop56: do { int alt56=2; int LA56_0 = input.LA(1); - if ( ((LA56_0>=STAR && LA56_0<=SLASH)||(LA56_0>=96 && LA56_0<=97)) ) { + if ( ((LA56_0>=STAR && LA56_0<=SLASH)||(LA56_0>=99 && LA56_0<=100)) ) { alt56=1; } switch (alt56) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:21: ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) + // ACG_ANTLR3.g:874:21: ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:21: ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) + // ACG_ANTLR3.g:874:21: ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) int alt55=4; switch ( input.LA(1) ) { case STAR: @@ -8128,42 +7426,44 @@ public class ACG_ANTLR3Parser extends Parser { alt55=2; } break; - case 96: + case 99: { alt55=3; } break; - case 97: + case 100: { alt55=4; } break; default: NoViableAltException nvae = - new NoViableAltException("841:21: ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) )", 55, 0, input); + new NoViableAltException("", 55, 0, input); throw nvae; } switch (alt55) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:22: ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) + // ACG_ANTLR3.g:874:22: ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:22: ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:23: STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) + // ACG_ANTLR3.g:874:22: ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) + // ACG_ANTLR3.g:874:23: STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) { - match(input,STAR,FOLLOW_STAR_in_priority_24080); + match(input,STAR,FOLLOW_STAR_in_priority_24212); opName = "*"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:44: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:841:45: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 + // ACG_ANTLR3.g:874:44: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) + // ACG_ANTLR3.g:874:45: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 { - pushFollow(FOLLOW_operatorCallExp_in_priority_24087); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_24219); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_1_in_priority_24092); + state._fsp--; + + pushFollow(FOLLOW_priority_1_in_priority_24224); right=priority_1(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8177,23 +7477,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:842:71: ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) + // ACG_ANTLR3.g:875:71: ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:842:71: ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:842:72: SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) + // ACG_ANTLR3.g:875:71: ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) + // ACG_ANTLR3.g:875:72: SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) { - match(input,SLASH,FOLLOW_SLASH_in_priority_24100); + match(input,SLASH,FOLLOW_SLASH_in_priority_24232); opName = "/"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:842:94: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:842:95: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 + // ACG_ANTLR3.g:875:94: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) + // ACG_ANTLR3.g:875:95: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 { - pushFollow(FOLLOW_operatorCallExp_in_priority_24107); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_24239); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_1_in_priority_24112); + state._fsp--; + + pushFollow(FOLLOW_priority_1_in_priority_24244); right=priority_1(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8207,23 +7509,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:843:71: ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) + // ACG_ANTLR3.g:876:71: ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:843:71: ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:843:72: 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) + // ACG_ANTLR3.g:876:71: ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) + // ACG_ANTLR3.g:876:72: 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) { - match(input,96,FOLLOW_96_in_priority_24120); + match(input,99,FOLLOW_99_in_priority_24252); opName = "div"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:843:96: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:843:97: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 + // ACG_ANTLR3.g:876:96: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) + // ACG_ANTLR3.g:876:97: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 { - pushFollow(FOLLOW_operatorCallExp_in_priority_24127); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_24259); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_1_in_priority_24132); + state._fsp--; + + pushFollow(FOLLOW_priority_1_in_priority_24264); right=priority_1(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8237,23 +7541,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:844:71: ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) + // ACG_ANTLR3.g:877:71: ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:844:71: ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:844:72: 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) + // ACG_ANTLR3.g:877:71: ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) + // ACG_ANTLR3.g:877:72: 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) { - match(input,97,FOLLOW_97_in_priority_24140); + match(input,100,FOLLOW_100_in_priority_24272); opName = "mod"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:844:96: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:844:97: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 + // ACG_ANTLR3.g:877:96: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) + // ACG_ANTLR3.g:877:97: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 { - pushFollow(FOLLOW_operatorCallExp_in_priority_24147); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_24279); + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; - pushFollow(FOLLOW_priority_1_in_priority_24152); + pushFollow(FOLLOW_priority_1_in_priority_24284); right=priority_1(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8296,11 +7602,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_2 + // $ANTLR end "priority_2" - // $ANTLR start priority_3 - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:852:1: priority_3 returns [Object ret2] : (ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* ) ; + // $ANTLR start "priority_3" + // ACG_ANTLR3.g:885:1: priority_3 returns [Object ret2] : (ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* ) ; public final Object priority_3() throws RecognitionException { Object ret2 = null; @@ -8311,17 +7617,18 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.String opName=null; org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:2: ( (ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:4: (ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* ) + // ACG_ANTLR3.g:886:2: ( (ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* ) ) + // ACG_ANTLR3.g:886:4: (ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:4: (ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:5: ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* + // ACG_ANTLR3.g:886:4: (ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* ) + // ACG_ANTLR3.g:886:5: ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* { - pushFollow(FOLLOW_priority_2_in_priority_34193); + pushFollow(FOLLOW_priority_2_in_priority_34325); ret=priority_2(); - _fsp--; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:20: ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* + state._fsp--; + + // ACG_ANTLR3.g:886:20: ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* loop58: do { int alt58=2; @@ -8334,9 +7641,9 @@ public class ACG_ANTLR3Parser extends Parser { switch (alt58) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:21: ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) + // ACG_ANTLR3.g:886:21: ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:21: ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) + // ACG_ANTLR3.g:886:21: ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) int alt57=2; int LA57_0 = input.LA(1); @@ -8348,29 +7655,31 @@ public class ACG_ANTLR3Parser extends Parser { } else { NoViableAltException nvae = - new NoViableAltException("853:21: ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) )", 57, 0, input); + new NoViableAltException("", 57, 0, input); throw nvae; } switch (alt57) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:22: ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) + // ACG_ANTLR3.g:886:22: ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:22: ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:23: PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) + // ACG_ANTLR3.g:886:22: ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) + // ACG_ANTLR3.g:886:23: PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) { - match(input,PLUS,FOLLOW_PLUS_in_priority_34198); + match(input,PLUS,FOLLOW_PLUS_in_priority_34330); opName = "+"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:44: (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:853:45: ret= operatorCallExp[opName, ret, firstToken] right= priority_2 + // ACG_ANTLR3.g:886:44: (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) + // ACG_ANTLR3.g:886:45: ret= operatorCallExp[opName, ret, firstToken] right= priority_2 { - pushFollow(FOLLOW_operatorCallExp_in_priority_34205); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_34337); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_2_in_priority_34210); + state._fsp--; + + pushFollow(FOLLOW_priority_2_in_priority_34342); right=priority_2(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8384,23 +7693,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:854:71: ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) + // ACG_ANTLR3.g:887:71: ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:854:71: ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:854:72: MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) + // ACG_ANTLR3.g:887:71: ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) + // ACG_ANTLR3.g:887:72: MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) { - match(input,MINUS,FOLLOW_MINUS_in_priority_34218); + match(input,MINUS,FOLLOW_MINUS_in_priority_34350); opName = "-"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:854:94: (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:854:95: ret= operatorCallExp[opName, ret, firstToken] right= priority_2 + // ACG_ANTLR3.g:887:94: (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) + // ACG_ANTLR3.g:887:95: ret= operatorCallExp[opName, ret, firstToken] right= priority_2 { - pushFollow(FOLLOW_operatorCallExp_in_priority_34225); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_34357); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_2_in_priority_34230); + state._fsp--; + + pushFollow(FOLLOW_priority_2_in_priority_34362); right=priority_2(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8443,11 +7754,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_3 + // $ANTLR end "priority_3" - // $ANTLR start priority_4 - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:862:1: priority_4 returns [Object ret2] : (ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* ) ; + // $ANTLR start "priority_4" + // ACG_ANTLR3.g:895:1: priority_4 returns [Object ret2] : (ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* ) ; public final Object priority_4() throws RecognitionException { Object ret2 = null; @@ -8458,32 +7769,33 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.String opName=null; org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:2: ( (ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:4: (ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* ) + // ACG_ANTLR3.g:896:2: ( (ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* ) ) + // ACG_ANTLR3.g:896:4: (ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:4: (ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:5: ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* + // ACG_ANTLR3.g:896:4: (ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* ) + // ACG_ANTLR3.g:896:5: ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* { - pushFollow(FOLLOW_priority_3_in_priority_44271); + pushFollow(FOLLOW_priority_3_in_priority_44403); ret=priority_3(); - _fsp--; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:20: ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* + state._fsp--; + + // ACG_ANTLR3.g:896:20: ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) )* loop60: do { int alt60=2; int LA60_0 = input.LA(1); - if ( (LA60_0==EQ||(LA60_0>=GT && LA60_0<=NE)||LA60_0==98) ) { + if ( (LA60_0==EQ||(LA60_0>=GT && LA60_0<=NE)||LA60_0==101) ) { alt60=1; } switch (alt60) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:21: ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) + // ACG_ANTLR3.g:896:21: ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:21: ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) + // ACG_ANTLR3.g:896:21: ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) ) int alt59=7; switch ( input.LA(1) ) { case EQ: @@ -8516,37 +7828,39 @@ public class ACG_ANTLR3Parser extends Parser { alt59=6; } break; - case 98: + case 101: { alt59=7; } break; default: NoViableAltException nvae = - new NoViableAltException("863:21: ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( 'isa' ret= isAExp[opName, ret, firstToken] ) )", 59, 0, input); + new NoViableAltException("", 59, 0, input); throw nvae; } switch (alt59) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:22: ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:896:22: ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:22: ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:23: EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:896:22: ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:896:23: EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,EQ,FOLLOW_EQ_in_priority_44276); + match(input,EQ,FOLLOW_EQ_in_priority_44408); opName = "="; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:42: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:863:43: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 + // ACG_ANTLR3.g:896:42: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:896:43: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { - pushFollow(FOLLOW_operatorCallExp_in_priority_44283); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_44415); + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; - pushFollow(FOLLOW_priority_3_in_priority_44288); + pushFollow(FOLLOW_priority_3_in_priority_44420); right=priority_3(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8560,23 +7874,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:864:71: ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:897:71: ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:864:71: ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:864:72: GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:897:71: ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:897:72: GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,GT,FOLLOW_GT_in_priority_44296); + match(input,GT,FOLLOW_GT_in_priority_44428); opName = ">"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:864:91: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:864:92: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 + // ACG_ANTLR3.g:897:91: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:897:92: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { - pushFollow(FOLLOW_operatorCallExp_in_priority_44303); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_44435); + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; - pushFollow(FOLLOW_priority_3_in_priority_44308); + pushFollow(FOLLOW_priority_3_in_priority_44440); right=priority_3(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8590,23 +7906,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:865:71: ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:898:71: ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:865:71: ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:865:72: LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:898:71: ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:898:72: LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,LT,FOLLOW_LT_in_priority_44316); + match(input,LT,FOLLOW_LT_in_priority_44448); opName = "<"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:865:91: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:865:92: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 + // ACG_ANTLR3.g:898:91: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:898:92: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { - pushFollow(FOLLOW_operatorCallExp_in_priority_44323); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_44455); + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; - pushFollow(FOLLOW_priority_3_in_priority_44328); + pushFollow(FOLLOW_priority_3_in_priority_44460); right=priority_3(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8620,23 +7938,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:866:71: ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:899:71: ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:866:71: ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:866:72: GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:899:71: ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:899:72: GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,GE,FOLLOW_GE_in_priority_44336); + match(input,GE,FOLLOW_GE_in_priority_44468); opName = ">="; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:866:92: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:866:93: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 + // ACG_ANTLR3.g:899:92: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:899:93: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { - pushFollow(FOLLOW_operatorCallExp_in_priority_44343); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_44475); + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; - pushFollow(FOLLOW_priority_3_in_priority_44348); + pushFollow(FOLLOW_priority_3_in_priority_44480); right=priority_3(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8650,23 +7970,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:867:71: ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:900:71: ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:867:71: ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:867:72: LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:900:71: ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:900:72: LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,LE,FOLLOW_LE_in_priority_44356); + match(input,LE,FOLLOW_LE_in_priority_44488); opName = "<="; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:867:92: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:867:93: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 + // ACG_ANTLR3.g:900:92: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:900:93: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { - pushFollow(FOLLOW_operatorCallExp_in_priority_44363); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_44495); + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; - pushFollow(FOLLOW_priority_3_in_priority_44368); + pushFollow(FOLLOW_priority_3_in_priority_44500); right=priority_3(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8680,23 +8002,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 6 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:868:71: ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:901:71: ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:868:71: ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:868:72: NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:901:71: ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) + // ACG_ANTLR3.g:901:72: NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,NE,FOLLOW_NE_in_priority_44376); + match(input,NE,FOLLOW_NE_in_priority_44508); opName = "<>"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:868:92: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:868:93: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 + // ACG_ANTLR3.g:901:92: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) + // ACG_ANTLR3.g:901:93: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { - pushFollow(FOLLOW_operatorCallExp_in_priority_44383); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_44515); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_3_in_priority_44388); + state._fsp--; + + pushFollow(FOLLOW_priority_3_in_priority_44520); right=priority_3(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8710,16 +8034,17 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 7 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:869:71: ( 'isa' ret= isAExp[opName, ret, firstToken] ) + // ACG_ANTLR3.g:902:71: ( 'isa' ret= isAExp[opName, ret, firstToken] ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:869:71: ( 'isa' ret= isAExp[opName, ret, firstToken] ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:869:72: 'isa' ret= isAExp[opName, ret, firstToken] + // ACG_ANTLR3.g:902:71: ( 'isa' ret= isAExp[opName, ret, firstToken] ) + // ACG_ANTLR3.g:902:72: 'isa' ret= isAExp[opName, ret, firstToken] { - match(input,98,FOLLOW_98_in_priority_44396); + match(input,101,FOLLOW_101_in_priority_44528); opName = "isa"; - pushFollow(FOLLOW_isAExp_in_priority_44402); - ret=isAExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_isAExp_in_priority_44534); + ret=isAExp(opName, ret, firstToken); + + state._fsp--; } @@ -8757,11 +8082,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_4 + // $ANTLR end "priority_4" - // $ANTLR start priority_5 - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:876:1: priority_5 returns [Object ret2] : (ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* ) ; + // $ANTLR start "priority_5" + // ACG_ANTLR3.g:909:1: priority_5 returns [Object ret2] : (ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* ) ; public final Object priority_5() throws RecognitionException { Object ret2 = null; @@ -8772,80 +8097,83 @@ public class ACG_ANTLR3Parser extends Parser { java.lang.String opName=null; org.antlr.runtime.Token firstToken=input.LT(1); try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:2: ( (ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:4: (ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* ) + // ACG_ANTLR3.g:910:2: ( (ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* ) ) + // ACG_ANTLR3.g:910:4: (ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:4: (ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:5: ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* + // ACG_ANTLR3.g:910:4: (ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* ) + // ACG_ANTLR3.g:910:5: ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* { - pushFollow(FOLLOW_priority_4_in_priority_54442); + pushFollow(FOLLOW_priority_4_in_priority_54574); ret=priority_4(); - _fsp--; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:20: ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* + state._fsp--; + + // ACG_ANTLR3.g:910:20: ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* loop62: do { int alt62=2; int LA62_0 = input.LA(1); - if ( ((LA62_0>=99 && LA62_0<=102)) ) { + if ( ((LA62_0>=102 && LA62_0<=105)) ) { alt62=1; } switch (alt62) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:21: ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) + // ACG_ANTLR3.g:910:21: ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:21: ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) + // ACG_ANTLR3.g:910:21: ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) int alt61=4; switch ( input.LA(1) ) { - case 99: + case 102: { alt61=1; } break; - case 100: + case 103: { alt61=2; } break; - case 101: + case 104: { alt61=3; } break; - case 102: + case 105: { alt61=4; } break; default: NoViableAltException nvae = - new NoViableAltException("877:21: ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) )", 61, 0, input); + new NoViableAltException("", 61, 0, input); throw nvae; } switch (alt61) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:22: ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) + // ACG_ANTLR3.g:910:22: ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:22: ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:23: 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) + // ACG_ANTLR3.g:910:22: ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) + // ACG_ANTLR3.g:910:23: 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) { - match(input,99,FOLLOW_99_in_priority_54447); + match(input,102,FOLLOW_102_in_priority_54579); opName = "and"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:47: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:877:48: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 + // ACG_ANTLR3.g:910:47: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) + // ACG_ANTLR3.g:910:48: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 { - pushFollow(FOLLOW_operatorCallExp_in_priority_54454); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_54586); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_4_in_priority_54459); + state._fsp--; + + pushFollow(FOLLOW_priority_4_in_priority_54591); right=priority_4(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8859,23 +8187,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:878:71: ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) + // ACG_ANTLR3.g:911:71: ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:878:71: ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:878:72: 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) + // ACG_ANTLR3.g:911:71: ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) + // ACG_ANTLR3.g:911:72: 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) { - match(input,100,FOLLOW_100_in_priority_54467); + match(input,103,FOLLOW_103_in_priority_54599); opName = "or"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:878:94: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:878:95: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 + // ACG_ANTLR3.g:911:94: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) + // ACG_ANTLR3.g:911:95: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 { - pushFollow(FOLLOW_operatorCallExp_in_priority_54474); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_54606); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_4_in_priority_54479); + state._fsp--; + + pushFollow(FOLLOW_priority_4_in_priority_54611); right=priority_4(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8889,23 +8219,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:879:71: ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) + // ACG_ANTLR3.g:912:71: ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:879:71: ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:879:72: 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) + // ACG_ANTLR3.g:912:71: ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) + // ACG_ANTLR3.g:912:72: 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) { - match(input,101,FOLLOW_101_in_priority_54487); + match(input,104,FOLLOW_104_in_priority_54619); opName = "xor"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:879:96: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:879:97: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 + // ACG_ANTLR3.g:912:96: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) + // ACG_ANTLR3.g:912:97: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 { - pushFollow(FOLLOW_operatorCallExp_in_priority_54494); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_54626); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_4_in_priority_54499); + state._fsp--; + + pushFollow(FOLLOW_priority_4_in_priority_54631); right=priority_4(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8919,23 +8251,25 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:880:71: ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) + // ACG_ANTLR3.g:913:71: ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:880:71: ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:880:72: 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) + // ACG_ANTLR3.g:913:71: ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) + // ACG_ANTLR3.g:913:72: 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) { - match(input,102,FOLLOW_102_in_priority_54507); + match(input,105,FOLLOW_105_in_priority_54639); opName = "implies"; - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:880:104: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:880:105: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 + // ACG_ANTLR3.g:913:104: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) + // ACG_ANTLR3.g:913:105: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 { - pushFollow(FOLLOW_operatorCallExp_in_priority_54514); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; + pushFollow(FOLLOW_operatorCallExp_in_priority_54646); + ret=operatorCallExp(opName, ret, firstToken); - pushFollow(FOLLOW_priority_4_in_priority_54519); + state._fsp--; + + pushFollow(FOLLOW_priority_4_in_priority_54651); right=priority_4(); - _fsp--; + + state._fsp--; ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); @@ -8978,11 +8312,11 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_5 + // $ANTLR end "priority_5" - // $ANTLR start primary_expression - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:888:1: primary_expression returns [Object ret2] : ( ( LPAREN ret= expression RPAREN ) | ret= variableExp | ret= selfExp | ret= lastExp | ret= ifExp | ret= literalExp ) ; + // $ANTLR start "primary_expression" + // ACG_ANTLR3.g:921:1: primary_expression returns [Object ret2] : ( ( LPAREN ret= expression RPAREN ) | ret= variableExp | ret= selfExp | ret= lastExp | ret= ifExp | ret= literalExp ) ; public final Object primary_expression() throws RecognitionException { Object ret2 = null; @@ -8990,10 +8324,10 @@ public class ACG_ANTLR3Parser extends Parser { try { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:2: ( ( ( LPAREN ret= expression RPAREN ) | ret= variableExp | ret= selfExp | ret= lastExp | ret= ifExp | ret= literalExp ) ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:4: ( ( LPAREN ret= expression RPAREN ) | ret= variableExp | ret= selfExp | ret= lastExp | ret= ifExp | ret= literalExp ) + // ACG_ANTLR3.g:922:2: ( ( ( LPAREN ret= expression RPAREN ) | ret= variableExp | ret= selfExp | ret= lastExp | ret= ifExp | ret= literalExp ) ) + // ACG_ANTLR3.g:922:4: ( ( LPAREN ret= expression RPAREN ) | ret= variableExp | ret= selfExp | ret= lastExp | ret= ifExp | ret= literalExp ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:4: ( ( LPAREN ret= expression RPAREN ) | ret= variableExp | ret= selfExp | ret= lastExp | ret= ifExp | ret= literalExp ) + // ACG_ANTLR3.g:922:4: ( ( LPAREN ret= expression RPAREN ) | ret= variableExp | ret= selfExp | ret= lastExp | ret= ifExp | ret= literalExp ) int alt63=6; switch ( input.LA(1) ) { case LPAREN: @@ -9006,12 +8340,12 @@ public class ACG_ANTLR3Parser extends Parser { alt63=2; } break; - case 87: + case 90: { alt63=3; } break; - case 88: + case 91: { alt63=4; } @@ -9023,34 +8357,35 @@ public class ACG_ANTLR3Parser extends Parser { break; case STRING: case INT: - case 91: - case 92: - case 93: case 94: + case 95: + case 96: + case 97: { alt63=6; } break; default: NoViableAltException nvae = - new NoViableAltException("889:4: ( ( LPAREN ret= expression RPAREN ) | ret= variableExp | ret= selfExp | ret= lastExp | ret= ifExp | ret= literalExp )", 63, 0, input); + new NoViableAltException("", 63, 0, input); throw nvae; } switch (alt63) { case 1 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:5: ( LPAREN ret= expression RPAREN ) + // ACG_ANTLR3.g:922:5: ( LPAREN ret= expression RPAREN ) { - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:5: ( LPAREN ret= expression RPAREN ) - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:6: LPAREN ret= expression RPAREN + // ACG_ANTLR3.g:922:5: ( LPAREN ret= expression RPAREN ) + // ACG_ANTLR3.g:922:6: LPAREN ret= expression RPAREN { - match(input,LPAREN,FOLLOW_LPAREN_in_primary_expression4559); - pushFollow(FOLLOW_expression_in_primary_expression4563); + match(input,LPAREN,FOLLOW_LPAREN_in_primary_expression4691); + pushFollow(FOLLOW_expression_in_primary_expression4695); ret=expression(); - _fsp--; - match(input,RPAREN,FOLLOW_RPAREN_in_primary_expression4565); + state._fsp--; + + match(input,RPAREN,FOLLOW_RPAREN_in_primary_expression4697); } @@ -9058,51 +8393,56 @@ public class ACG_ANTLR3Parser extends Parser { } break; case 2 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:37: ret= variableExp + // ACG_ANTLR3.g:922:37: ret= variableExp { - pushFollow(FOLLOW_variableExp_in_primary_expression4571); + pushFollow(FOLLOW_variableExp_in_primary_expression4703); ret=variableExp(); - _fsp--; + + state._fsp--; } break; case 3 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:54: ret= selfExp + // ACG_ANTLR3.g:922:54: ret= selfExp { - pushFollow(FOLLOW_selfExp_in_primary_expression4576); + pushFollow(FOLLOW_selfExp_in_primary_expression4708); ret=selfExp(); - _fsp--; + + state._fsp--; } break; case 4 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:67: ret= lastExp + // ACG_ANTLR3.g:922:67: ret= lastExp { - pushFollow(FOLLOW_lastExp_in_primary_expression4581); + pushFollow(FOLLOW_lastExp_in_primary_expression4713); ret=lastExp(); - _fsp--; + + state._fsp--; } break; case 5 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:80: ret= ifExp + // ACG_ANTLR3.g:922:80: ret= ifExp { - pushFollow(FOLLOW_ifExp_in_primary_expression4586); + pushFollow(FOLLOW_ifExp_in_primary_expression4718); ret=ifExp(); - _fsp--; + + state._fsp--; } break; case 6 : - // D:\\dev\\workspaces\\3.3.2\\TCS\\ACG\\Syntax\\ACG_ANTLR3.g:889:91: ret= literalExp + // ACG_ANTLR3.g:922:91: ret= literalExp { - pushFollow(FOLLOW_literalExp_in_primary_expression4591); + pushFollow(FOLLOW_literalExp_in_primary_expression4723); ret=literalExp(); - _fsp--; + + state._fsp--; } @@ -9125,9 +8465,263 @@ public class ACG_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end primary_expression + // $ANTLR end "primary_expression" + + // Delegated rules + + + protected DFA51 dfa51 = new DFA51(this); + static final String DFA51_eotS = + "\104\uffff"; + static final String DFA51_eofS = + "\104\uffff"; + static final String DFA51_minS = + "\102\4\2\uffff"; + static final String DFA51_maxS = + "\102\151\2\uffff"; + static final String DFA51_acceptS = + "\102\uffff\1\2\1\1"; + static final String DFA51_specialS = + "\104\uffff}>"; + static final String[] DFA51_transitionS = { + "\1\1\45\uffff\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+ + "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1"+ + "\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1"+ + "\44\1\45\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1"+ + "\60\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\70\1\71\1\72\1\73\1"+ + "\74\1\75\1\76\1\77\1\100\1\101", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "\1\103\2\uffff\2\103\1\uffff\1\102\4\103\1\uffff\16\103\21"+ + "\uffff\1\103\1\uffff\6\103\1\uffff\5\103\3\uffff\32\103\2\uffff"+ + "\2\103\5\uffff\7\103", + "", + "" + }; + + static final short[] DFA51_eot = DFA.unpackEncodedString(DFA51_eotS); + static final short[] DFA51_eof = DFA.unpackEncodedString(DFA51_eofS); + static final char[] DFA51_min = DFA.unpackEncodedStringToUnsignedChars(DFA51_minS); + static final char[] DFA51_max = DFA.unpackEncodedStringToUnsignedChars(DFA51_maxS); + static final short[] DFA51_accept = DFA.unpackEncodedString(DFA51_acceptS); + static final short[] DFA51_special = DFA.unpackEncodedString(DFA51_specialS); + static final short[][] DFA51_transition; + + static { + int numStates = DFA51_transitionS.length; + DFA51_transition = new short[numStates][]; + for (int i=0; i<numStates; i++) { + DFA51_transition[i] = DFA.unpackEncodedString(DFA51_transitionS[i]); + } + } + class DFA51 extends DFA { + public DFA51(BaseRecognizer recognizer) { + this.recognizer = recognizer; + this.decisionNumber = 51; + this.eot = DFA51_eot; + this.eof = DFA51_eof; + this.min = DFA51_min; + this.max = DFA51_max; + this.accept = DFA51_accept; + this.special = DFA51_special; + this.transition = DFA51_transition; + } + public String getDescription() { + return "856:53: (ret= navigationExp[opName, ret, firstToken] | ret= operationCallExp[opName, ret, firstToken] )"; + } + } public static final BitSet FOLLOW_aCG_in_main46 = new BitSet(new long[]{0x0000000000000000L}); @@ -9195,342 +8789,352 @@ public class ACG_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_100_in_identifierOrKeyword412 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_101_in_identifierOrKeyword417 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_102_in_identifierOrKeyword422 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_STRING_in_stringSymbol457 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_INT_in_integerSymbol491 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_42_in_aCG524 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_aCG528 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_43_in_aCG532 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_aCG536 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_aCG540 = new BitSet(new long[]{0x0001700000000110L}); - public static final BitSet FOLLOW_aCGElement_in_aCG548 = new BitSet(new long[]{0x0001700000000110L}); - public static final BitSet FOLLOW_aCGElement_in_aCG556 = new BitSet(new long[]{0x0001700000000110L}); - public static final BitSet FOLLOW_RCURLY_in_aCG568 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_function_in_aCGElement603 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_attribute_in_aCGElement608 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_node_in_aCGElement613 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_44_in_function646 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_function650 = new BitSet(new long[]{0x0000000000000200L}); - public static final BitSet FOLLOW_COLONCOLON_in_function654 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_function658 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_LPAREN_in_function662 = new BitSet(new long[]{0x0000000000001010L}); - public static final BitSet FOLLOW_parameter_in_function670 = new BitSet(new long[]{0x0000000000001800L}); - public static final BitSet FOLLOW_COMA_in_function677 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_parameter_in_function682 = new BitSet(new long[]{0x0000000000001800L}); - public static final BitSet FOLLOW_RPAREN_in_function701 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_EQ_in_function703 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_function707 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_SEMI_in_function711 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_45_in_attribute743 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_attribute747 = new BitSet(new long[]{0x0000000000000200L}); - public static final BitSet FOLLOW_COLONCOLON_in_attribute751 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_attribute755 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_EQ_in_attribute759 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_attribute763 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_SEMI_in_attribute767 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifier_in_parameter801 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_aSMNode_in_node838 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_codeNode_in_node843 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_simpleNode_in_node848 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_46_in_aSMNode881 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_aSMNode885 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_47_in_aSMNode889 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_aSMNode893 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_aSMNode897 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_aSMNode905 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_aSMNode913 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_aSMNode925 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_48_in_codeNode957 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_codeNode961 = new BitSet(new long[]{0x0002000000008080L}); - public static final BitSet FOLLOW_49_in_codeNode967 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_codeNode971 = new BitSet(new long[]{0x0000000000008080L}); - public static final BitSet FOLLOW_PIPE_in_codeNode987 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_codeNode991 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_codeNode1005 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_codeNode1013 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_codeNode1021 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_codeNode1033 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifier_in_simpleNode1067 = new BitSet(new long[]{0x0002000000008080L}); - public static final BitSet FOLLOW_49_in_simpleNode1073 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_simpleNode1077 = new BitSet(new long[]{0x0000000000008080L}); - public static final BitSet FOLLOW_PIPE_in_simpleNode1093 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_simpleNode1097 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_simpleNode1111 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_simpleNode1119 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_simpleNode1127 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_simpleNode1139 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_compoundStat_in_statement1174 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_reportStat_in_statement1179 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_fieldStat_in_statement1184 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_paramStat_in_statement1189 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_emitStat_in_statement1194 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_forEachStat_in_compoundStat1230 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_onceStat_in_compoundStat1235 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_variableStat_in_compoundStat1240 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_operationStat_in_compoundStat1245 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_conditionalStat_in_compoundStat1250 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_letStat_in_compoundStat1255 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_analyzeStat_in_compoundStat1260 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_50_in_forEachStat1293 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_LPAREN_in_forEachStat1295 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_variableDecl_in_forEachStat1299 = new BitSet(new long[]{0x0008000000000000L}); - public static final BitSet FOLLOW_51_in_forEachStat1303 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_forEachStat1307 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_RPAREN_in_forEachStat1311 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_forEachStat1313 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_forEachStat1321 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_forEachStat1329 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_forEachStat1341 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LSQUARE_in_onceStat1373 = new BitSet(new long[]{0x1D54000000030010L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_onceStat1381 = new BitSet(new long[]{0x1D54000000030010L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_onceStat1389 = new BitSet(new long[]{0x1D54000000030010L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RSQUARE_in_onceStat1401 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_52_in_variableStat1433 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_variableStat1437 = new BitSet(new long[]{0x0020000000000000L}); - public static final BitSet FOLLOW_53_in_variableStat1441 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_variableStat1445 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_variableStat1449 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_variableStat1457 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_variableStat1465 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_variableStat1477 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_54_in_operationStat1509 = new BitSet(new long[]{0x0080000000000000L}); - public static final BitSet FOLLOW_55_in_operationStat1511 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_operationStat1515 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_47_in_operationStat1519 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_operationStat1523 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_operationStat1527 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_operationStat1535 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_operationStat1543 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_operationStat1555 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_56_in_conditionalStat1587 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_LPAREN_in_conditionalStat1589 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_conditionalStat1593 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_RPAREN_in_conditionalStat1597 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_conditionalStat1599 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_conditionalStat1607 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_conditionalStat1615 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_conditionalStat1627 = new BitSet(new long[]{0x0200000000000002L}); - public static final BitSet FOLLOW_57_in_conditionalStat1631 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_conditionalStat1633 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_conditionalStat1641 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_conditionalStat1649 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_conditionalStat1661 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_58_in_letStat1703 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_variableDecl_in_letStat1707 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_EQ_in_letStat1711 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_letStat1715 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_letStat1719 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_letStat1727 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_letStat1735 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_letStat1747 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_59_in_analyzeStat1779 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_analyzeStat1783 = new BitSet(new long[]{0x0002000000000082L}); - public static final BitSet FOLLOW_49_in_analyzeStat1789 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_analyzeStat1793 = new BitSet(new long[]{0x0000000000000082L}); - public static final BitSet FOLLOW_LCURLY_in_analyzeStat1809 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_analyzeStat1817 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_statement_in_analyzeStat1825 = new BitSet(new long[]{0x1D54000000010110L,0x00000000007FFFFFL}); - public static final BitSet FOLLOW_RCURLY_in_analyzeStat1837 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_60_in_reportStat1879 = new BitSet(new long[]{0xE000000000000000L}); - public static final BitSet FOLLOW_severity_in_reportStat1883 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_reportStat1889 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_61_in_severity1924 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_62_in_severity1931 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_63_in_severity1938 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_64_in_fieldStat1973 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_fieldStat1977 = new BitSet(new long[]{0x0000000000040000L}); - public static final BitSet FOLLOW_COLON_in_fieldStat1981 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_fieldStat1985 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_65_in_paramStat2019 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_paramStat2023 = new BitSet(new long[]{0x0000000000040000L}); - public static final BitSet FOLLOW_COLON_in_paramStat2027 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_paramStat2031 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_labelStat_in_emitStat2068 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_newStat_in_emitStat2073 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_dupStat_in_emitStat2078 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_dupX1Stat_in_emitStat2083 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_popStat_in_emitStat2088 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_swapStat_in_emitStat2093 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_iterateStat_in_emitStat2098 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_endIterateStat_in_emitStat2103 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_getAsmStat_in_emitStat2108 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_findMEStat_in_emitStat2113 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_pushTStat_in_emitStat2118 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_pushFStat_in_emitStat2123 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_emitWithOperandStat_in_emitStat2128 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_emitWithLabelRefStat_in_emitStat2133 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifier_in_labelStat2168 = new BitSet(new long[]{0x0000000000040400L}); - public static final BitSet FOLLOW_LPAREN_in_labelStat2174 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_labelStat2178 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_RPAREN_in_labelStat2182 = new BitSet(new long[]{0x0000000000040000L}); - public static final BitSet FOLLOW_COLON_in_labelStat2194 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_66_in_newStat2226 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_67_in_dupStat2258 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_68_in_dupX1Stat2290 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_69_in_popStat2322 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_70_in_swapStat2354 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_71_in_iterateStat2386 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_72_in_endIterateStat2418 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_73_in_getAsmStat2450 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_74_in_findMEStat2482 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_75_in_pushTStat2514 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_76_in_pushFStat2546 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_pushStat_in_emitWithOperandStat2581 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_pushIStat_in_emitWithOperandStat2586 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_pushDStat_in_emitWithOperandStat2591 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_loadStat_in_emitWithOperandStat2596 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_storeStat_in_emitWithOperandStat2601 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_callStat_in_emitWithOperandStat2606 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_superCallStat_in_emitWithOperandStat2611 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_getStat_in_emitWithOperandStat2616 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_setStat_in_emitWithOperandStat2621 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_77_in_pushStat2654 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_pushStat2658 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_78_in_pushIStat2692 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_pushIStat2696 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_79_in_pushDStat2730 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_pushDStat2734 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_80_in_loadStat2768 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_loadStat2772 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_81_in_storeStat2806 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_storeStat2810 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_82_in_callStat2844 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_callStat2848 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_83_in_superCallStat2882 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_superCallStat2886 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_84_in_getStat2920 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_getStat2924 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_85_in_setStat2958 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_setStat2962 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_gotoStat_in_emitWithLabelRefStat2999 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ifStat_in_emitWithLabelRefStat3004 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_86_in_gotoStat3037 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_gotoStat3041 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_56_in_ifStat3075 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_identifier_in_ifStat3079 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifier_in_variableDecl3115 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_priority_5_in_expression3151 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_letExp_in_expression3156 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifier_in_variableExp3190 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_87_in_selfExp3224 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_88_in_lastExp3256 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_56_in_ifExp3288 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_ifExp3292 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L}); - public static final BitSet FOLLOW_89_in_ifExp3296 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_ifExp3300 = new BitSet(new long[]{0x0200000000000000L}); - public static final BitSet FOLLOW_57_in_ifExp3304 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_ifExp3308 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L}); - public static final BitSet FOLLOW_90_in_ifExp3312 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifier_in_isAExp3347 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_58_in_letExp3381 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_variableDecl_in_letExp3385 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_EQ_in_letExp3389 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_letExp3393 = new BitSet(new long[]{0x0008000000000000L}); - public static final BitSet FOLLOW_51_in_letExp3397 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_letExp3401 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifierOrKeyword_in_navigationExp3438 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifierOrKeyword_in_iteratorExp3475 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_LPAREN_in_iteratorExp3479 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_variableDecl_in_iteratorExp3483 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_PIPE_in_iteratorExp3487 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_iteratorExp3491 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_RPAREN_in_iteratorExp3495 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifierOrKeyword_in_operationCallExp3530 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_LPAREN_in_operationCallExp3534 = new BitSet(new long[]{0x0500000000201470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_operationCallExp3540 = new BitSet(new long[]{0x0000000000001800L}); - public static final BitSet FOLLOW_COMA_in_operationCallExp3547 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_operationCallExp3552 = new BitSet(new long[]{0x0000000000001800L}); - public static final BitSet FOLLOW_RPAREN_in_operationCallExp3562 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_oclUndefinedExp_in_literalExp3626 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_collectionExp_in_literalExp3631 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_booleanExp_in_literalExp3636 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_integerExp_in_literalExp3641 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_stringExp_in_literalExp3646 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_91_in_oclUndefinedExp3679 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_sequenceExp_in_collectionExp3713 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_92_in_sequenceExp3745 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_LCURLY_in_sequenceExp3747 = new BitSet(new long[]{0x0500000000200570L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_sequenceExp3753 = new BitSet(new long[]{0x0000000000000900L}); - public static final BitSet FOLLOW_COMA_in_sequenceExp3760 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_sequenceExp3765 = new BitSet(new long[]{0x0000000000000900L}); - public static final BitSet FOLLOW_RCURLY_in_sequenceExp3775 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_93_in_booleanExp3809 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_94_in_booleanExp3816 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_integerSymbol_in_integerExp3854 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_stringSymbol_in_stringExp3890 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_primary_expression_in_priority_03926 = new BitSet(new long[]{0x0000000000180002L}); - public static final BitSet FOLLOW_POINT_in_priority_03931 = new BitSet(new long[]{0xFFFFFC0000000010L,0x0000007FFFFFFFFFL}); - public static final BitSet FOLLOW_navigationExp_in_priority_03938 = new BitSet(new long[]{0x0000000000180002L}); - public static final BitSet FOLLOW_operationCallExp_in_priority_03945 = new BitSet(new long[]{0x0000000000180002L}); - public static final BitSet FOLLOW_RARROW_in_priority_03953 = new BitSet(new long[]{0xFFFFFC0000000010L,0x0000007FFFFFFFFFL}); - public static final BitSet FOLLOW_iteratorExp_in_priority_03959 = new BitSet(new long[]{0x0000000000180002L}); - public static final BitSet FOLLOW_95_in_priority_13998 = new BitSet(new long[]{0x0100000000000470L,0x0000000079800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_14005 = new BitSet(new long[]{0x0100000000000470L,0x0000000079800000L}); - public static final BitSet FOLLOW_priority_0_in_priority_14010 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_MINUS_in_priority_14018 = new BitSet(new long[]{0x0100000000000470L,0x0000000079800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_14025 = new BitSet(new long[]{0x0100000000000470L,0x0000000079800000L}); - public static final BitSet FOLLOW_priority_0_in_priority_14030 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_priority_0_in_priority_14040 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_priority_1_in_priority_24075 = new BitSet(new long[]{0x0000000000C00002L,0x0000000300000000L}); - public static final BitSet FOLLOW_STAR_in_priority_24080 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_24087 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_1_in_priority_24092 = new BitSet(new long[]{0x0000000000C00002L,0x0000000300000000L}); - public static final BitSet FOLLOW_SLASH_in_priority_24100 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_24107 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_1_in_priority_24112 = new BitSet(new long[]{0x0000000000C00002L,0x0000000300000000L}); - public static final BitSet FOLLOW_96_in_priority_24120 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_24127 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_1_in_priority_24132 = new BitSet(new long[]{0x0000000000C00002L,0x0000000300000000L}); - public static final BitSet FOLLOW_97_in_priority_24140 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_24147 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_1_in_priority_24152 = new BitSet(new long[]{0x0000000000C00002L,0x0000000300000000L}); - public static final BitSet FOLLOW_priority_2_in_priority_34193 = new BitSet(new long[]{0x0000000001200002L}); - public static final BitSet FOLLOW_PLUS_in_priority_34198 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_34205 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_2_in_priority_34210 = new BitSet(new long[]{0x0000000001200002L}); - public static final BitSet FOLLOW_MINUS_in_priority_34218 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_34225 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_2_in_priority_34230 = new BitSet(new long[]{0x0000000001200002L}); - public static final BitSet FOLLOW_priority_3_in_priority_44271 = new BitSet(new long[]{0x000000003E002002L,0x0000000400000000L}); - public static final BitSet FOLLOW_EQ_in_priority_44276 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_44283 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_3_in_priority_44288 = new BitSet(new long[]{0x000000003E002002L,0x0000000400000000L}); - public static final BitSet FOLLOW_GT_in_priority_44296 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_44303 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_3_in_priority_44308 = new BitSet(new long[]{0x000000003E002002L,0x0000000400000000L}); - public static final BitSet FOLLOW_LT_in_priority_44316 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_44323 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_3_in_priority_44328 = new BitSet(new long[]{0x000000003E002002L,0x0000000400000000L}); - public static final BitSet FOLLOW_GE_in_priority_44336 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_44343 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_3_in_priority_44348 = new BitSet(new long[]{0x000000003E002002L,0x0000000400000000L}); - public static final BitSet FOLLOW_LE_in_priority_44356 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_44363 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_3_in_priority_44368 = new BitSet(new long[]{0x000000003E002002L,0x0000000400000000L}); - public static final BitSet FOLLOW_NE_in_priority_44376 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_44383 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_3_in_priority_44388 = new BitSet(new long[]{0x000000003E002002L,0x0000000400000000L}); - public static final BitSet FOLLOW_98_in_priority_44396 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_isAExp_in_priority_44402 = new BitSet(new long[]{0x000000003E002002L,0x0000000400000000L}); - public static final BitSet FOLLOW_priority_4_in_priority_54442 = new BitSet(new long[]{0x0000000000000002L,0x0000007800000000L}); - public static final BitSet FOLLOW_99_in_priority_54447 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_54454 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_4_in_priority_54459 = new BitSet(new long[]{0x0000000000000002L,0x0000007800000000L}); - public static final BitSet FOLLOW_100_in_priority_54467 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_54474 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_4_in_priority_54479 = new BitSet(new long[]{0x0000000000000002L,0x0000007800000000L}); - public static final BitSet FOLLOW_101_in_priority_54487 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_54494 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_4_in_priority_54499 = new BitSet(new long[]{0x0000000000000002L,0x0000007800000000L}); - public static final BitSet FOLLOW_102_in_priority_54507 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_54514 = new BitSet(new long[]{0x0100000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_priority_4_in_priority_54519 = new BitSet(new long[]{0x0000000000000002L,0x0000007800000000L}); - public static final BitSet FOLLOW_LPAREN_in_primary_expression4559 = new BitSet(new long[]{0x0500000000200470L,0x00000000F9800000L}); - public static final BitSet FOLLOW_expression_in_primary_expression4563 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_RPAREN_in_primary_expression4565 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_variableExp_in_primary_expression4571 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_selfExp_in_primary_expression4576 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_lastExp_in_primary_expression4581 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ifExp_in_primary_expression4586 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_literalExp_in_primary_expression4591 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_103_in_identifierOrKeyword427 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_104_in_identifierOrKeyword432 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_105_in_identifierOrKeyword437 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_STRING_in_stringSymbol472 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_INT_in_integerSymbol506 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_42_in_aCG539 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_aCG543 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_43_in_aCG547 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_aCG551 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_aCG555 = new BitSet(new long[]{0x0001700000000110L}); + public static final BitSet FOLLOW_aCGElement_in_aCG563 = new BitSet(new long[]{0x0001700000000110L}); + public static final BitSet FOLLOW_aCGElement_in_aCG571 = new BitSet(new long[]{0x0001700000000110L}); + public static final BitSet FOLLOW_RCURLY_in_aCG583 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_function_in_aCGElement618 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_attribute_in_aCGElement623 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_node_in_aCGElement628 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_44_in_function661 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_function665 = new BitSet(new long[]{0x0000000000000200L}); + public static final BitSet FOLLOW_COLONCOLON_in_function669 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_function673 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_LPAREN_in_function677 = new BitSet(new long[]{0x0000000000001010L}); + public static final BitSet FOLLOW_parameter_in_function685 = new BitSet(new long[]{0x0000000000001800L}); + public static final BitSet FOLLOW_COMA_in_function692 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_parameter_in_function697 = new BitSet(new long[]{0x0000000000001800L}); + public static final BitSet FOLLOW_RPAREN_in_function716 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_EQ_in_function718 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_function722 = new BitSet(new long[]{0x0000000000004000L}); + public static final BitSet FOLLOW_SEMI_in_function726 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_45_in_attribute758 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_attribute762 = new BitSet(new long[]{0x0000000000000200L}); + public static final BitSet FOLLOW_COLONCOLON_in_attribute766 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_attribute770 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_EQ_in_attribute774 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_attribute778 = new BitSet(new long[]{0x0000000000004000L}); + public static final BitSet FOLLOW_SEMI_in_attribute782 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifier_in_parameter816 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_aSMNode_in_node853 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_codeNode_in_node858 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_simpleNode_in_node863 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_46_in_aSMNode896 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_aSMNode900 = new BitSet(new long[]{0x0000800000000000L}); + public static final BitSet FOLLOW_47_in_aSMNode904 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_aSMNode908 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_aSMNode912 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_aSMNode920 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_aSMNode928 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_aSMNode940 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_48_in_codeNode972 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_codeNode976 = new BitSet(new long[]{0x0002000000008080L}); + public static final BitSet FOLLOW_49_in_codeNode982 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_codeNode986 = new BitSet(new long[]{0x0000000000008080L}); + public static final BitSet FOLLOW_PIPE_in_codeNode1002 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_codeNode1006 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_codeNode1020 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_codeNode1028 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_codeNode1036 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_codeNode1048 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifier_in_simpleNode1082 = new BitSet(new long[]{0x0002000000008080L}); + public static final BitSet FOLLOW_49_in_simpleNode1088 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_simpleNode1092 = new BitSet(new long[]{0x0000000000008080L}); + public static final BitSet FOLLOW_PIPE_in_simpleNode1108 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_simpleNode1112 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_simpleNode1126 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_simpleNode1134 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_simpleNode1142 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_simpleNode1154 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_compoundStat_in_statement1189 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_reportStat_in_statement1194 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_fieldStat_in_statement1199 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_paramStat_in_statement1204 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_emitStat_in_statement1209 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_forEachStat_in_compoundStat1245 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_onceStat_in_compoundStat1250 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_variableStat_in_compoundStat1255 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_operationStat_in_compoundStat1260 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_conditionalStat_in_compoundStat1265 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_letStat_in_compoundStat1270 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_analyzeStat_in_compoundStat1275 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_50_in_forEachStat1308 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_LPAREN_in_forEachStat1310 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_variableDecl_in_forEachStat1314 = new BitSet(new long[]{0x0008000000000000L}); + public static final BitSet FOLLOW_51_in_forEachStat1318 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_forEachStat1322 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_RPAREN_in_forEachStat1326 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_forEachStat1328 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_forEachStat1336 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_forEachStat1344 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_forEachStat1356 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LSQUARE_in_onceStat1388 = new BitSet(new long[]{0x1D54000000030010L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_onceStat1396 = new BitSet(new long[]{0x1D54000000030010L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_onceStat1404 = new BitSet(new long[]{0x1D54000000030010L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RSQUARE_in_onceStat1416 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_52_in_variableStat1448 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_variableStat1452 = new BitSet(new long[]{0x0020000000000000L}); + public static final BitSet FOLLOW_53_in_variableStat1456 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_variableStat1460 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_variableStat1464 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_variableStat1472 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_variableStat1480 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_variableStat1492 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_54_in_operationStat1524 = new BitSet(new long[]{0x0080000000000000L}); + public static final BitSet FOLLOW_55_in_operationStat1526 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_operationStat1530 = new BitSet(new long[]{0x0000800000000000L}); + public static final BitSet FOLLOW_47_in_operationStat1534 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_operationStat1538 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_operationStat1542 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_operationStat1550 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_operationStat1558 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_operationStat1570 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_56_in_conditionalStat1602 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_LPAREN_in_conditionalStat1604 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_conditionalStat1608 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_RPAREN_in_conditionalStat1612 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_conditionalStat1614 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_conditionalStat1622 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_conditionalStat1630 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_conditionalStat1642 = new BitSet(new long[]{0x0200000000000002L}); + public static final BitSet FOLLOW_57_in_conditionalStat1646 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_conditionalStat1648 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_conditionalStat1656 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_conditionalStat1664 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_conditionalStat1676 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_58_in_letStat1718 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_variableDecl_in_letStat1722 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_EQ_in_letStat1726 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_letStat1730 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_letStat1734 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_letStat1742 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_letStat1750 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_letStat1762 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_59_in_analyzeStat1794 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_analyzeStat1798 = new BitSet(new long[]{0x0002000000000082L}); + public static final BitSet FOLLOW_49_in_analyzeStat1804 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_analyzeStat1808 = new BitSet(new long[]{0x0000000000000082L}); + public static final BitSet FOLLOW_LCURLY_in_analyzeStat1824 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_analyzeStat1832 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_statement_in_analyzeStat1840 = new BitSet(new long[]{0x1D54000000010110L,0x0000000003FFFFFFL}); + public static final BitSet FOLLOW_RCURLY_in_analyzeStat1852 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_60_in_reportStat1894 = new BitSet(new long[]{0xE000000000000000L}); + public static final BitSet FOLLOW_severity_in_reportStat1898 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_reportStat1904 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_61_in_severity1939 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_62_in_severity1946 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_63_in_severity1953 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_64_in_fieldStat1988 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_fieldStat1992 = new BitSet(new long[]{0x0000000000040000L}); + public static final BitSet FOLLOW_COLON_in_fieldStat1996 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_fieldStat2000 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_65_in_paramStat2034 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_paramStat2038 = new BitSet(new long[]{0x0000000000040000L}); + public static final BitSet FOLLOW_COLON_in_paramStat2042 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_paramStat2046 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_labelStat_in_emitStat2083 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_newStat_in_emitStat2088 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_newinStat_in_emitStat2093 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_deleteStat_in_emitStat2098 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_dupStat_in_emitStat2103 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_dupX1Stat_in_emitStat2108 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_popStat_in_emitStat2113 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_swapStat_in_emitStat2118 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_iterateStat_in_emitStat2123 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_endIterateStat_in_emitStat2128 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_getAsmStat_in_emitStat2133 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_findMEStat_in_emitStat2138 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_pushTStat_in_emitStat2143 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_pushFStat_in_emitStat2148 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_emitWithOperandStat_in_emitStat2153 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_emitWithLabelRefStat_in_emitStat2158 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifier_in_labelStat2193 = new BitSet(new long[]{0x0000000000040400L}); + public static final BitSet FOLLOW_LPAREN_in_labelStat2199 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_labelStat2203 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_RPAREN_in_labelStat2207 = new BitSet(new long[]{0x0000000000040000L}); + public static final BitSet FOLLOW_COLON_in_labelStat2219 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_66_in_newStat2251 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_67_in_newinStat2283 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_68_in_deleteStat2315 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_69_in_dupStat2347 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_70_in_dupX1Stat2379 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_71_in_popStat2411 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_72_in_swapStat2443 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_73_in_iterateStat2475 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_74_in_endIterateStat2507 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_75_in_getAsmStat2539 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_76_in_findMEStat2571 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_77_in_pushTStat2603 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_78_in_pushFStat2635 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_pushStat_in_emitWithOperandStat2670 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_pushIStat_in_emitWithOperandStat2675 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_pushDStat_in_emitWithOperandStat2680 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_loadStat_in_emitWithOperandStat2685 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_storeStat_in_emitWithOperandStat2690 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_callStat_in_emitWithOperandStat2695 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_pCallStat_in_emitWithOperandStat2700 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_superCallStat_in_emitWithOperandStat2705 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_getStat_in_emitWithOperandStat2710 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_setStat_in_emitWithOperandStat2715 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_79_in_pushStat2748 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_pushStat2752 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_80_in_pushIStat2786 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_pushIStat2790 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_81_in_pushDStat2824 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_pushDStat2828 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_82_in_loadStat2862 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_loadStat2866 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_83_in_storeStat2900 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_storeStat2904 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_84_in_callStat2938 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_callStat2942 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_85_in_pCallStat2976 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_pCallStat2980 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_86_in_superCallStat3014 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_superCallStat3018 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_87_in_getStat3052 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_getStat3056 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_88_in_setStat3090 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_setStat3094 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_gotoStat_in_emitWithLabelRefStat3131 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ifStat_in_emitWithLabelRefStat3136 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_89_in_gotoStat3169 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_gotoStat3173 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_56_in_ifStat3207 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_identifier_in_ifStat3211 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifier_in_variableDecl3247 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_priority_5_in_expression3283 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_letExp_in_expression3288 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifier_in_variableExp3322 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_90_in_selfExp3356 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_91_in_lastExp3388 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_56_in_ifExp3420 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_ifExp3424 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L}); + public static final BitSet FOLLOW_92_in_ifExp3428 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_ifExp3432 = new BitSet(new long[]{0x0200000000000000L}); + public static final BitSet FOLLOW_57_in_ifExp3436 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_ifExp3440 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L}); + public static final BitSet FOLLOW_93_in_ifExp3444 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifier_in_isAExp3479 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_58_in_letExp3513 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_variableDecl_in_letExp3517 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_EQ_in_letExp3521 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_letExp3525 = new BitSet(new long[]{0x0008000000000000L}); + public static final BitSet FOLLOW_51_in_letExp3529 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_letExp3533 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifierOrKeyword_in_navigationExp3570 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifierOrKeyword_in_iteratorExp3607 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_LPAREN_in_iteratorExp3611 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_variableDecl_in_iteratorExp3615 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_PIPE_in_iteratorExp3619 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_iteratorExp3623 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_RPAREN_in_iteratorExp3627 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifierOrKeyword_in_operationCallExp3662 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_LPAREN_in_operationCallExp3666 = new BitSet(new long[]{0x0500000000201470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_operationCallExp3672 = new BitSet(new long[]{0x0000000000001800L}); + public static final BitSet FOLLOW_COMA_in_operationCallExp3679 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_operationCallExp3684 = new BitSet(new long[]{0x0000000000001800L}); + public static final BitSet FOLLOW_RPAREN_in_operationCallExp3694 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_oclUndefinedExp_in_literalExp3758 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_collectionExp_in_literalExp3763 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_booleanExp_in_literalExp3768 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_integerExp_in_literalExp3773 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_stringExp_in_literalExp3778 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_94_in_oclUndefinedExp3811 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_sequenceExp_in_collectionExp3845 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_95_in_sequenceExp3877 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_LCURLY_in_sequenceExp3879 = new BitSet(new long[]{0x0500000000200570L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_sequenceExp3885 = new BitSet(new long[]{0x0000000000000900L}); + public static final BitSet FOLLOW_COMA_in_sequenceExp3892 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_sequenceExp3897 = new BitSet(new long[]{0x0000000000000900L}); + public static final BitSet FOLLOW_RCURLY_in_sequenceExp3907 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_96_in_booleanExp3941 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_97_in_booleanExp3948 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_integerSymbol_in_integerExp3986 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_stringSymbol_in_stringExp4022 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_primary_expression_in_priority_04058 = new BitSet(new long[]{0x0000000000180002L}); + public static final BitSet FOLLOW_POINT_in_priority_04063 = new BitSet(new long[]{0xFFFFFC0000000010L,0x000003FFFFFFFFFFL}); + public static final BitSet FOLLOW_navigationExp_in_priority_04070 = new BitSet(new long[]{0x0000000000180002L}); + public static final BitSet FOLLOW_operationCallExp_in_priority_04077 = new BitSet(new long[]{0x0000000000180002L}); + public static final BitSet FOLLOW_RARROW_in_priority_04085 = new BitSet(new long[]{0xFFFFFC0000000010L,0x000003FFFFFFFFFFL}); + public static final BitSet FOLLOW_iteratorExp_in_priority_04091 = new BitSet(new long[]{0x0000000000180002L}); + public static final BitSet FOLLOW_98_in_priority_14130 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_14137 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_0_in_priority_14142 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_MINUS_in_priority_14150 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_14157 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_0_in_priority_14162 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_priority_0_in_priority_14172 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_priority_1_in_priority_24207 = new BitSet(new long[]{0x0000000000C00002L,0x0000001800000000L}); + public static final BitSet FOLLOW_STAR_in_priority_24212 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_24219 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_1_in_priority_24224 = new BitSet(new long[]{0x0000000000C00002L,0x0000001800000000L}); + public static final BitSet FOLLOW_SLASH_in_priority_24232 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_24239 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_1_in_priority_24244 = new BitSet(new long[]{0x0000000000C00002L,0x0000001800000000L}); + public static final BitSet FOLLOW_99_in_priority_24252 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_24259 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_1_in_priority_24264 = new BitSet(new long[]{0x0000000000C00002L,0x0000001800000000L}); + public static final BitSet FOLLOW_100_in_priority_24272 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_24279 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_1_in_priority_24284 = new BitSet(new long[]{0x0000000000C00002L,0x0000001800000000L}); + public static final BitSet FOLLOW_priority_2_in_priority_34325 = new BitSet(new long[]{0x0000000001200002L}); + public static final BitSet FOLLOW_PLUS_in_priority_34330 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_34337 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_2_in_priority_34342 = new BitSet(new long[]{0x0000000001200002L}); + public static final BitSet FOLLOW_MINUS_in_priority_34350 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_34357 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_2_in_priority_34362 = new BitSet(new long[]{0x0000000001200002L}); + public static final BitSet FOLLOW_priority_3_in_priority_44403 = new BitSet(new long[]{0x000000003E002002L,0x0000002000000000L}); + public static final BitSet FOLLOW_EQ_in_priority_44408 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_44415 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_3_in_priority_44420 = new BitSet(new long[]{0x000000003E002002L,0x0000002000000000L}); + public static final BitSet FOLLOW_GT_in_priority_44428 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_44435 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_3_in_priority_44440 = new BitSet(new long[]{0x000000003E002002L,0x0000002000000000L}); + public static final BitSet FOLLOW_LT_in_priority_44448 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_44455 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_3_in_priority_44460 = new BitSet(new long[]{0x000000003E002002L,0x0000002000000000L}); + public static final BitSet FOLLOW_GE_in_priority_44468 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_44475 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_3_in_priority_44480 = new BitSet(new long[]{0x000000003E002002L,0x0000002000000000L}); + public static final BitSet FOLLOW_LE_in_priority_44488 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_44495 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_3_in_priority_44500 = new BitSet(new long[]{0x000000003E002002L,0x0000002000000000L}); + public static final BitSet FOLLOW_NE_in_priority_44508 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_44515 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_3_in_priority_44520 = new BitSet(new long[]{0x000000003E002002L,0x0000002000000000L}); + public static final BitSet FOLLOW_101_in_priority_44528 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_isAExp_in_priority_44534 = new BitSet(new long[]{0x000000003E002002L,0x0000002000000000L}); + public static final BitSet FOLLOW_priority_4_in_priority_54574 = new BitSet(new long[]{0x0000000000000002L,0x000003C000000000L}); + public static final BitSet FOLLOW_102_in_priority_54579 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_54586 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_4_in_priority_54591 = new BitSet(new long[]{0x0000000000000002L,0x000003C000000000L}); + public static final BitSet FOLLOW_103_in_priority_54599 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_54606 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_4_in_priority_54611 = new BitSet(new long[]{0x0000000000000002L,0x000003C000000000L}); + public static final BitSet FOLLOW_104_in_priority_54619 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_54626 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_4_in_priority_54631 = new BitSet(new long[]{0x0000000000000002L,0x000003C000000000L}); + public static final BitSet FOLLOW_105_in_priority_54639 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_54646 = new BitSet(new long[]{0x0100000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_priority_4_in_priority_54651 = new BitSet(new long[]{0x0000000000000002L,0x000003C000000000L}); + public static final BitSet FOLLOW_LPAREN_in_primary_expression4691 = new BitSet(new long[]{0x0500000000200470L,0x00000007CC000000L}); + public static final BitSet FOLLOW_expression_in_primary_expression4695 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_RPAREN_in_primary_expression4697 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_variableExp_in_primary_expression4703 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_selfExp_in_primary_expression4708 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_lastExp_in_primary_expression4713 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ifExp_in_primary_expression4718 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_literalExp_in_primary_expression4723 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3__.g b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3__.g deleted file mode 100644 index f53680f4..00000000 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ACG_ANTLR3__.g +++ /dev/null @@ -1,466 +0,0 @@ -lexer grammar ACG_ANTLR3; -@members { - - private void newline() {} - - public org.eclipse.m2m.atl.dsls.tcs.injector.TCSRuntime ei = null; - - public void displayRecognitionError(String[] tokenNames, RecognitionException e) { - ei.reportError((Exception)e); - } - - public Token emit() { - org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken ret = null; - - ret = new org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken(input, type, channel, tokenStartCharIndex, getCharIndex()-1); - ret.setLine(tokenStartLine); - ret.setText(text); - ret.setCharPositionInLine(tokenStartCharPositionInLine); - ret.setEndLine(getLine()); - ret.setEndColumn(getCharPositionInLine()); - emit(ret); - - return ret; - } - -} -@header {package org.eclipse.m2m.atl.dsls.tcs.injector;} - -T42 : 'acg' ; -T43 : 'startsWith' ; -T44 : 'function' ; -T45 : 'attribute' ; -T46 : 'asm' ; -T47 : 'name' ; -T48 : 'code' ; -T49 : 'mode' ; -T50 : 'foreach' ; -T51 : 'in' ; -T52 : 'variable' ; -T53 : 'named' ; -T54 : 'operation' ; -T55 : 'context' ; -T56 : 'if' ; -T57 : 'else' ; -T58 : 'let' ; -T59 : 'analyze' ; -T60 : 'report' ; -T61 : 'critic' ; -T62 : 'error' ; -T63 : 'warning' ; -T64 : 'field' ; -T65 : 'param' ; -T66 : 'new' ; -T67 : 'dup' ; -T68 : 'dup_x1' ; -T69 : 'pop' ; -T70 : 'swap' ; -T71 : 'iterate' ; -T72 : 'enditerate' ; -T73 : 'getasm' ; -T74 : 'findme' ; -T75 : 'pusht' ; -T76 : 'pushf' ; -T77 : 'push' ; -T78 : 'pushi' ; -T79 : 'pushd' ; -T80 : 'load' ; -T81 : 'store' ; -T82 : 'call' ; -T83 : 'supercall' ; -T84 : 'get' ; -T85 : 'set' ; -T86 : 'goto' ; -T87 : 'self' ; -T88 : 'last' ; -T89 : 'then' ; -T90 : 'endif' ; -T91 : 'OclUndefined' ; -T92 : 'Sequence' ; -T93 : 'true' ; -T94 : 'false' ; -T95 : 'not' ; -T96 : 'div' ; -T97 : 'mod' ; -T98 : 'isa' ; -T99 : 'and' ; -T100 : 'or' ; -T101 : 'xor' ; -T102 : 'implies' ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 897 -NL - : ( '\r' '\n' - | '\n' '\r' //Improbable - | '\r' - | '\n' - ) - {newline();} - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 906 -WS - : ( ' ' - | '\t' - ) - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 912 -fragment -DIGIT - : '0'..'9' - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 917 -fragment -ALPHA - : 'a'..'z' - | 'A'..'Z' - | '_' - //For Unicode compatibility (from 0000 to 00ff) - | '\u00C0' .. '\u00D6' - | '\u00D8' .. '\u00F6' - | '\u00F8' .. '\u00FF' - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 928 -fragment -SNAME -// options { -// testLiterals = true; -// } - : (ALPHA) (ALPHA | DIGIT)* -; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 936 -NAME - : ( - SNAME -// s:SNAME {if(s.getType() != SNAME) $setType(s.getType());} - | '"'! - ( ESC - | '\n' {newline();} - | ~('\\'|'\"'|'\n') - )* - '"'! - {setText(ei.unescapeString(getText(), 1));} - ) - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 950 -INT - : (DIGIT)+ -// (('.' DIGIT)=> '.' (DIGIT)+ {$setType(FLOAT);})? - ; - - // $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 955 -FLOAT : DIGIT+ '.' DIGIT* ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 957 -fragment -ESC - : '\\'! - ( 'n' //{setText("\n");} - | 'r' //{setText("\r");} - | 't' //{setText("\t");} - | 'b' //{setText("\b");} - | 'f' //{setText("\f");} - | '"' //{setText("\"");} - | '\'' //{setText("\'");} - | '\\' //{setText("\\");} - | ( - ('0'..'3') - ( -// options { -// warnWhenFollowAmbig = false; -// } - : ('0'..'7') - ( -// options { -// warnWhenFollowAmbig = false; -// } - : '0'..'7' - )? - )? - | ('4'..'7') - ( -// options { -// warnWhenFollowAmbig = false; -// } - : ('0'..'7') - )? - ) - { -// String s = getText(); -// int i; -// int ret = 0; -// String ans; -// for (i=0; i<s.length(); ++i) -// ret = ret*8 + s.charAt(i) - '0'; -// ans = String.valueOf((char) ret); -// setText(ans); - } - ) - ; - - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1004 -LSQUARE @init {} - : '[' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1012 -RSQUARE @init {} - : ']' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1020 -EXCL @init {} - : '!' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1028 -COMA @init {} - : ',' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1036 -LPAREN @init {} - : '(' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1044 -RPAREN @init {} - : ')' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1052 -LCURLY @init {} - : '{' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1060 -RCURLY @init {} - : '}' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1068 -SEMI @init {} - : ';' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1076 -COLON @init {} - : ':' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1084 -PIPE @init {} - : '|' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1092 -SHARP @init {} - : '#' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1100 -QMARK @init {} - : '?' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1108 -COLONCOLON @init {} - : '::' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1116 -POINT @init {} - : '.' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1124 -RARROW @init {} - : '->' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1132 -MINUS @init {} - : '-' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1140 -STAR @init {} - : '*' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1148 -SLASH @init {} - : '/' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1156 -PLUS @init {} - : '+' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1164 -EQ @init {} - : '=' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1172 -GT @init {} - : '>' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1180 -LT @init {} - : '<' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1188 -GE @init {} - : '>=' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1196 -LE @init {} - : '<=' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1204 -NE @init {} - : '<>' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1212 -LARROW @init {} - : '<-' - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1220 -COMMENT @init {} - : (('--' (~('\r'| '\n'))*)) - { - - } - - ; - -// $ANTLR src "D:\dev\workspaces\3.3.2\TCS\ACG\Syntax\ACG_ANTLR3.g" 1228 -STRING @init {} - : (('\'' (options {greedy = false;} : (('\\'! ~ '\n')| '\n'| ~('\\'| '\n')))* '\'')) - { - - } - - ; diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3.tokens b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3.tokens index b8f64f36..ba45030a 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3.tokens +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3.tokens @@ -1,97 +1,155 @@ -GE=29 -LT=28 -STAR=24 -ASSIGNARROW=17 -LSQUARE=38 -SHARP=21 -POINT=22 -AROBAS=41 +T__50=50 +QMARK=40 +MINUS=23 +RSQUARE=39 +T__59=59 +T__55=55 +T__56=56 +T__57=57 +T__58=58 +T__51=51 +T__52=52 +T__53=53 +T__54=54 +COMA=9 +T__60=60 +T__61=61 +LPAREN=12 +T__66=66 +T__67=67 +T__68=68 +T__69=69 +T__62=62 +T__63=63 +T__64=64 +T__65=65 +SEMI=8 +COMMENT=42 ESC=37 +RCURLY=15 +AROBAS=41 +LCURLY=14 RARROW=16 +T__48=48 +STAR=24 +T__49=49 LARROW=18 -LCURLY=14 -FLOAT=7 -INT=6 +T__44=44 +T__45=45 +STRING=5 +SHARP=21 +LE=30 +T__46=46 +T__47=47 EXCL=19 -RSQUARE=39 -MINUS=23 -COMA=9 -SEMI=8 +T__43=43 +T__91=91 +T__100=100 +T__92=92 +T__93=93 +T__94=94 +T__90=90 +LT=28 ALPHA=35 -LPAREN=12 -COLON=11 +PIPE=20 +T__99=99 +T__95=95 +T__96=96 +T__97=97 +T__98=98 RPAREN=13 +EQ=10 NAME=4 +ASSIGNARROW=17 +NE=31 +NL=32 +PLUS=26 +T__70=70 +T__71=71 +FLOAT=7 +T__72=72 +INT=6 +T__77=77 +T__78=78 +T__79=79 +T__73=73 WS=33 +T__74=74 +T__75=75 +GE=29 +T__76=76 +T__80=80 +T__81=81 +T__82=82 +T__83=83 SLASH=25 SNAME=36 -RCURLY=15 +COLON=11 GT=27 -PLUS=26 -PIPE=20 DIGIT=34 -NL=32 -EQ=10 -COMMENT=42 -QMARK=40 -LE=30 -STRING=5 -NE=31 -'iterate'=72 -'Sequence'=83 -'then'=76 -'Real'=90 -'OclType'=86 -'Integer'=89 -'nodefault'=53 +LSQUARE=38 +T__88=88 +T__89=89 +T__84=84 +POINT=22 +T__85=85 +T__86=86 +T__87=87 +'Set'=81 +'not'=94 +'and'=97 +'super'=78 +'in'=62 +'else'=70 +'div'=95 +'or'=98 +'xor'=99 +'drop'=67 +'to'=63 +'OclAny'=87 +'OrderedSet'=82 'refining'=45 'Boolean'=91 -'create'=44 +'Bag'=80 'uses'=49 -'for'=71 'endpoint'=61 -'library'=47 -'Set'=81 -'true'=74 -'rule'=55 -'else'=70 -'extends'=56 -'let'=79 -'and'=97 -'unique'=58 -'def'=51 +'from'=46 +'OclType'=86 +'OclUndefined'=73 'if'=69 -'not'=94 -'in'=62 -'mapsTo'=64 +'extends'=56 +'Integer'=89 'using'=57 +'true'=74 +'create'=44 +'def'=51 +'lazy'=59 'query'=48 -'foreach'=66 -'context'=52 -'OrderedSet'=82 -'mod'=96 -'OclUndefined'=73 -'drop'=67 -'div'=95 -'distinct'=65 -'Collection'=93 -'Tuple'=85 +'TupleType'=88 'module'=43 +'then'=76 +'distinct'=65 +'let'=79 'String'=92 -'lazy'=59 -'Bag'=80 -'helper'=50 -'xor'=99 -'do'=68 -'super'=78 -'TupleType'=88 -'entrypoint'=60 +'mapsTo'=64 +'mod'=96 +'nodefault'=53 +'unique'=58 +'Map'=84 'abstract'=54 -'to'=63 +'Collection'=93 +'entrypoint'=60 +'Real'=90 +'Sequence'=83 'false'=75 -'OclAny'=87 -'or'=98 -'Map'=84 +'context'=52 +'do'=68 'implies'=100 +'helper'=50 +'Tuple'=85 +'rule'=55 +'for'=71 +'foreach'=66 +'library'=47 +'iterate'=72 'endif'=77 -'from'=46 diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3Lexer.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3Lexer.java index 6e27c7ad..9f0da7cd 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3Lexer.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3Lexer.java @@ -1,15 +1,4 @@ -/** - * Copyright (c) 2008 INRIA. - * 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: - * INRIA - initial API and implementation - * - */ -// $ANTLR 3.0.1 ATL_ANTLR3.g 2011-05-04 14:11:58 +// $ANTLR 3.2 Sep 23, 2009 12:02:23 ATL_ANTLR3.g 2019-12-05 18:08:49 package org.eclipse.m2m.atl.dsls.tcs.injector; import org.antlr.runtime.*; @@ -18,1242 +7,1366 @@ import java.util.List; import java.util.ArrayList; public class ATL_ANTLR3Lexer extends Lexer { - public static final int LT=28; + public static final int T__50=50; + public static final int QMARK=40; + public static final int MINUS=23; + public static final int RSQUARE=39; + public static final int T__59=59; + public static final int T__55=55; + public static final int T__56=56; + public static final int T__57=57; + public static final int T__58=58; + public static final int T__51=51; + public static final int T__52=52; + public static final int T__53=53; + public static final int T__54=54; + public static final int COMA=9; + public static final int T__60=60; + public static final int T__61=61; + public static final int LPAREN=12; + public static final int T__66=66; + public static final int T__67=67; + public static final int T__68=68; + public static final int T__69=69; + public static final int T__62=62; + public static final int T__63=63; + public static final int T__64=64; + public static final int T__65=65; + public static final int SEMI=8; + public static final int COMMENT=42; + public static final int ESC=37; + public static final int RCURLY=15; + public static final int AROBAS=41; + public static final int LCURLY=14; + public static final int RARROW=16; + public static final int T__48=48; public static final int STAR=24; - public static final int LSQUARE=38; + public static final int T__49=49; + public static final int LARROW=18; + public static final int T__44=44; + public static final int T__45=45; + public static final int STRING=5; + public static final int SHARP=21; + public static final int LE=30; + public static final int T__46=46; + public static final int T__47=47; public static final int EXCL=19; - public static final int EOF=-1; + public static final int T__43=43; + public static final int T__91=91; + public static final int T__100=100; + public static final int T__92=92; + public static final int T__93=93; + public static final int T__94=94; + public static final int T__90=90; + public static final int LT=28; + public static final int ALPHA=35; + public static final int PIPE=20; + public static final int T__99=99; + public static final int T__95=95; + public static final int T__96=96; + public static final int T__97=97; + public static final int T__98=98; public static final int RPAREN=13; - public static final int NAME=4; - public static final int NL=32; public static final int EQ=10; - public static final int COMMENT=42; - public static final int NE=31; - public static final int GE=29; + public static final int NAME=4; public static final int ASSIGNARROW=17; - public static final int SHARP=21; - public static final int T49=49; - public static final int LCURLY=14; - public static final int T48=48; + public static final int NE=31; + public static final int NL=32; + public static final int PLUS=26; + public static final int T__70=70; + public static final int T__71=71; + public static final int FLOAT=7; + public static final int T__72=72; public static final int INT=6; - public static final int T100=100; - public static final int T43=43; - public static final int T47=47; - public static final int ALPHA=35; - public static final int T46=46; - public static final int T45=45; - public static final int T44=44; + public static final int T__77=77; + public static final int T__78=78; + public static final int T__79=79; + public static final int T__73=73; public static final int WS=33; + public static final int EOF=-1; + public static final int T__74=74; + public static final int T__75=75; + public static final int GE=29; + public static final int T__76=76; + public static final int T__80=80; + public static final int T__81=81; + public static final int T__82=82; + public static final int T__83=83; + public static final int SLASH=25; public static final int SNAME=36; - public static final int T50=50; - public static final int T59=59; + public static final int COLON=11; public static final int GT=27; - public static final int T52=52; - public static final int T51=51; - public static final int T54=54; - public static final int QMARK=40; - public static final int T53=53; - public static final int T56=56; - public static final int T55=55; - public static final int T58=58; - public static final int T57=57; - public static final int T75=75; - public static final int T76=76; - public static final int T73=73; - public static final int T74=74; - public static final int T79=79; - public static final int T77=77; - public static final int T78=78; - public static final int POINT=22; - public static final int AROBAS=41; - public static final int ESC=37; - public static final int LARROW=18; - public static final int FLOAT=7; - public static final int T72=72; - public static final int LPAREN=12; - public static final int T71=71; - public static final int T70=70; - public static final int T62=62; - public static final int T63=63; - public static final int T64=64; - public static final int T65=65; - public static final int SLASH=25; - public static final int T66=66; - public static final int T67=67; - public static final int T68=68; - public static final int T69=69; - public static final int PIPE=20; - public static final int PLUS=26; public static final int DIGIT=34; - public static final int T61=61; - public static final int T60=60; - public static final int T99=99; - public static final int T97=97; - public static final int T98=98; - public static final int T95=95; - public static final int T96=96; - public static final int RARROW=16; - public static final int MINUS=23; - public static final int RSQUARE=39; - public static final int T94=94; - public static final int Tokens=101; - public static final int T93=93; - public static final int COMA=9; - public static final int T92=92; - public static final int SEMI=8; - public static final int T91=91; - public static final int T90=90; - public static final int COLON=11; - public static final int T88=88; - public static final int T89=89; - public static final int T84=84; - public static final int T85=85; - public static final int T86=86; - public static final int T87=87; - public static final int RCURLY=15; - public static final int T81=81; - public static final int T80=80; - public static final int T83=83; - public static final int T82=82; - public static final int LE=30; - public static final int STRING=5; - - + public static final int LSQUARE=38; + public static final int T__88=88; + public static final int T__89=89; + public static final int T__84=84; + public static final int POINT=22; + public static final int T__85=85; + public static final int T__86=86; + public static final int T__87=87; + + private void newline() {} - + public org.eclipse.m2m.atl.dsls.tcs.injector.TCSRuntime ei = null; - + public void displayRecognitionError(String[] tokenNames, RecognitionException e) { ei.reportError((Exception)e); } - + public Token emit() { org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken ret = null; - - ret = new org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken(input, type, channel, tokenStartCharIndex, getCharIndex()-1); - ret.setLine(tokenStartLine); - ret.setText(text); - ret.setCharPositionInLine(tokenStartCharPositionInLine); + + ret = new org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken(input, state.type, state.channel, state.tokenStartCharIndex, getCharIndex()-1); + ret.setLine(state.tokenStartLine); + ret.setText(state.text); + ret.setCharPositionInLine(state.tokenStartCharPositionInLine); ret.setEndLine(getLine()); ret.setEndColumn(getCharPositionInLine()); emit(ret); - + return ret; } - + + + + // delegates + // delegators public ATL_ANTLR3Lexer() {;} public ATL_ANTLR3Lexer(CharStream input) { - super(input); + this(input, new RecognizerSharedState()); + } + public ATL_ANTLR3Lexer(CharStream input, RecognizerSharedState state) { + super(input,state); + } public String getGrammarFileName() { return "ATL_ANTLR3.g"; } - // $ANTLR start T43 - public final void mT43() throws RecognitionException { + // $ANTLR start "T__43" + public final void mT__43() throws RecognitionException { try { - int _type = T43; - // ATL_ANTLR3.g:29:5: ( 'module' ) - // ATL_ANTLR3.g:29:7: 'module' + int _type = T__43; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:30:7: ( 'module' ) + // ATL_ANTLR3.g:30:9: 'module' { match("module"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T43 + // $ANTLR end "T__43" - // $ANTLR start T44 - public final void mT44() throws RecognitionException { + // $ANTLR start "T__44" + public final void mT__44() throws RecognitionException { try { - int _type = T44; - // ATL_ANTLR3.g:30:5: ( 'create' ) - // ATL_ANTLR3.g:30:7: 'create' + int _type = T__44; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:31:7: ( 'create' ) + // ATL_ANTLR3.g:31:9: 'create' { match("create"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T44 + // $ANTLR end "T__44" - // $ANTLR start T45 - public final void mT45() throws RecognitionException { + // $ANTLR start "T__45" + public final void mT__45() throws RecognitionException { try { - int _type = T45; - // ATL_ANTLR3.g:31:5: ( 'refining' ) - // ATL_ANTLR3.g:31:7: 'refining' + int _type = T__45; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:32:7: ( 'refining' ) + // ATL_ANTLR3.g:32:9: 'refining' { match("refining"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T45 + // $ANTLR end "T__45" - // $ANTLR start T46 - public final void mT46() throws RecognitionException { + // $ANTLR start "T__46" + public final void mT__46() throws RecognitionException { try { - int _type = T46; - // ATL_ANTLR3.g:32:5: ( 'from' ) - // ATL_ANTLR3.g:32:7: 'from' + int _type = T__46; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:33:7: ( 'from' ) + // ATL_ANTLR3.g:33:9: 'from' { match("from"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T46 + // $ANTLR end "T__46" - // $ANTLR start T47 - public final void mT47() throws RecognitionException { + // $ANTLR start "T__47" + public final void mT__47() throws RecognitionException { try { - int _type = T47; - // ATL_ANTLR3.g:33:5: ( 'library' ) - // ATL_ANTLR3.g:33:7: 'library' + int _type = T__47; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:34:7: ( 'library' ) + // ATL_ANTLR3.g:34:9: 'library' { match("library"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T47 + // $ANTLR end "T__47" - // $ANTLR start T48 - public final void mT48() throws RecognitionException { + // $ANTLR start "T__48" + public final void mT__48() throws RecognitionException { try { - int _type = T48; - // ATL_ANTLR3.g:34:5: ( 'query' ) - // ATL_ANTLR3.g:34:7: 'query' + int _type = T__48; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:35:7: ( 'query' ) + // ATL_ANTLR3.g:35:9: 'query' { match("query"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T48 + // $ANTLR end "T__48" - // $ANTLR start T49 - public final void mT49() throws RecognitionException { + // $ANTLR start "T__49" + public final void mT__49() throws RecognitionException { try { - int _type = T49; - // ATL_ANTLR3.g:35:5: ( 'uses' ) - // ATL_ANTLR3.g:35:7: 'uses' + int _type = T__49; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:36:7: ( 'uses' ) + // ATL_ANTLR3.g:36:9: 'uses' { match("uses"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T49 + // $ANTLR end "T__49" - // $ANTLR start T50 - public final void mT50() throws RecognitionException { + // $ANTLR start "T__50" + public final void mT__50() throws RecognitionException { try { - int _type = T50; - // ATL_ANTLR3.g:36:5: ( 'helper' ) - // ATL_ANTLR3.g:36:7: 'helper' + int _type = T__50; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:37:7: ( 'helper' ) + // ATL_ANTLR3.g:37:9: 'helper' { match("helper"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T50 + // $ANTLR end "T__50" - // $ANTLR start T51 - public final void mT51() throws RecognitionException { + // $ANTLR start "T__51" + public final void mT__51() throws RecognitionException { try { - int _type = T51; - // ATL_ANTLR3.g:37:5: ( 'def' ) - // ATL_ANTLR3.g:37:7: 'def' + int _type = T__51; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:38:7: ( 'def' ) + // ATL_ANTLR3.g:38:9: 'def' { match("def"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T51 + // $ANTLR end "T__51" - // $ANTLR start T52 - public final void mT52() throws RecognitionException { + // $ANTLR start "T__52" + public final void mT__52() throws RecognitionException { try { - int _type = T52; - // ATL_ANTLR3.g:38:5: ( 'context' ) - // ATL_ANTLR3.g:38:7: 'context' + int _type = T__52; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:39:7: ( 'context' ) + // ATL_ANTLR3.g:39:9: 'context' { match("context"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T52 + // $ANTLR end "T__52" - // $ANTLR start T53 - public final void mT53() throws RecognitionException { + // $ANTLR start "T__53" + public final void mT__53() throws RecognitionException { try { - int _type = T53; - // ATL_ANTLR3.g:39:5: ( 'nodefault' ) - // ATL_ANTLR3.g:39:7: 'nodefault' + int _type = T__53; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:40:7: ( 'nodefault' ) + // ATL_ANTLR3.g:40:9: 'nodefault' { match("nodefault"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T53 + // $ANTLR end "T__53" - // $ANTLR start T54 - public final void mT54() throws RecognitionException { + // $ANTLR start "T__54" + public final void mT__54() throws RecognitionException { try { - int _type = T54; - // ATL_ANTLR3.g:40:5: ( 'abstract' ) - // ATL_ANTLR3.g:40:7: 'abstract' + int _type = T__54; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:41:7: ( 'abstract' ) + // ATL_ANTLR3.g:41:9: 'abstract' { match("abstract"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T54 + // $ANTLR end "T__54" - // $ANTLR start T55 - public final void mT55() throws RecognitionException { + // $ANTLR start "T__55" + public final void mT__55() throws RecognitionException { try { - int _type = T55; - // ATL_ANTLR3.g:41:5: ( 'rule' ) - // ATL_ANTLR3.g:41:7: 'rule' + int _type = T__55; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:42:7: ( 'rule' ) + // ATL_ANTLR3.g:42:9: 'rule' { match("rule"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T55 + // $ANTLR end "T__55" - // $ANTLR start T56 - public final void mT56() throws RecognitionException { + // $ANTLR start "T__56" + public final void mT__56() throws RecognitionException { try { - int _type = T56; - // ATL_ANTLR3.g:42:5: ( 'extends' ) - // ATL_ANTLR3.g:42:7: 'extends' + int _type = T__56; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:43:7: ( 'extends' ) + // ATL_ANTLR3.g:43:9: 'extends' { match("extends"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T56 + // $ANTLR end "T__56" - // $ANTLR start T57 - public final void mT57() throws RecognitionException { + // $ANTLR start "T__57" + public final void mT__57() throws RecognitionException { try { - int _type = T57; - // ATL_ANTLR3.g:43:5: ( 'using' ) - // ATL_ANTLR3.g:43:7: 'using' + int _type = T__57; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:44:7: ( 'using' ) + // ATL_ANTLR3.g:44:9: 'using' { match("using"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T57 + // $ANTLR end "T__57" - // $ANTLR start T58 - public final void mT58() throws RecognitionException { + // $ANTLR start "T__58" + public final void mT__58() throws RecognitionException { try { - int _type = T58; - // ATL_ANTLR3.g:44:5: ( 'unique' ) - // ATL_ANTLR3.g:44:7: 'unique' + int _type = T__58; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:45:7: ( 'unique' ) + // ATL_ANTLR3.g:45:9: 'unique' { match("unique"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T58 + // $ANTLR end "T__58" - // $ANTLR start T59 - public final void mT59() throws RecognitionException { + // $ANTLR start "T__59" + public final void mT__59() throws RecognitionException { try { - int _type = T59; - // ATL_ANTLR3.g:45:5: ( 'lazy' ) - // ATL_ANTLR3.g:45:7: 'lazy' + int _type = T__59; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:46:7: ( 'lazy' ) + // ATL_ANTLR3.g:46:9: 'lazy' { match("lazy"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T59 + // $ANTLR end "T__59" - // $ANTLR start T60 - public final void mT60() throws RecognitionException { + // $ANTLR start "T__60" + public final void mT__60() throws RecognitionException { try { - int _type = T60; - // ATL_ANTLR3.g:46:5: ( 'entrypoint' ) - // ATL_ANTLR3.g:46:7: 'entrypoint' + int _type = T__60; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:47:7: ( 'entrypoint' ) + // ATL_ANTLR3.g:47:9: 'entrypoint' { match("entrypoint"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T60 + // $ANTLR end "T__60" - // $ANTLR start T61 - public final void mT61() throws RecognitionException { + // $ANTLR start "T__61" + public final void mT__61() throws RecognitionException { try { - int _type = T61; - // ATL_ANTLR3.g:47:5: ( 'endpoint' ) - // ATL_ANTLR3.g:47:7: 'endpoint' + int _type = T__61; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:48:7: ( 'endpoint' ) + // ATL_ANTLR3.g:48:9: 'endpoint' { match("endpoint"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T61 + // $ANTLR end "T__61" - // $ANTLR start T62 - public final void mT62() throws RecognitionException { + // $ANTLR start "T__62" + public final void mT__62() throws RecognitionException { try { - int _type = T62; - // ATL_ANTLR3.g:48:5: ( 'in' ) - // ATL_ANTLR3.g:48:7: 'in' + int _type = T__62; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:49:7: ( 'in' ) + // ATL_ANTLR3.g:49:9: 'in' { match("in"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T62 + // $ANTLR end "T__62" - // $ANTLR start T63 - public final void mT63() throws RecognitionException { + // $ANTLR start "T__63" + public final void mT__63() throws RecognitionException { try { - int _type = T63; - // ATL_ANTLR3.g:49:5: ( 'to' ) - // ATL_ANTLR3.g:49:7: 'to' + int _type = T__63; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:50:7: ( 'to' ) + // ATL_ANTLR3.g:50:9: 'to' { match("to"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T63 + // $ANTLR end "T__63" - // $ANTLR start T64 - public final void mT64() throws RecognitionException { + // $ANTLR start "T__64" + public final void mT__64() throws RecognitionException { try { - int _type = T64; - // ATL_ANTLR3.g:50:5: ( 'mapsTo' ) - // ATL_ANTLR3.g:50:7: 'mapsTo' + int _type = T__64; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:51:7: ( 'mapsTo' ) + // ATL_ANTLR3.g:51:9: 'mapsTo' { match("mapsTo"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T64 + // $ANTLR end "T__64" - // $ANTLR start T65 - public final void mT65() throws RecognitionException { + // $ANTLR start "T__65" + public final void mT__65() throws RecognitionException { try { - int _type = T65; - // ATL_ANTLR3.g:51:5: ( 'distinct' ) - // ATL_ANTLR3.g:51:7: 'distinct' + int _type = T__65; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:52:7: ( 'distinct' ) + // ATL_ANTLR3.g:52:9: 'distinct' { match("distinct"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T65 + // $ANTLR end "T__65" - // $ANTLR start T66 - public final void mT66() throws RecognitionException { + // $ANTLR start "T__66" + public final void mT__66() throws RecognitionException { try { - int _type = T66; - // ATL_ANTLR3.g:52:5: ( 'foreach' ) - // ATL_ANTLR3.g:52:7: 'foreach' + int _type = T__66; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:53:7: ( 'foreach' ) + // ATL_ANTLR3.g:53:9: 'foreach' { match("foreach"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T66 + // $ANTLR end "T__66" - // $ANTLR start T67 - public final void mT67() throws RecognitionException { + // $ANTLR start "T__67" + public final void mT__67() throws RecognitionException { try { - int _type = T67; - // ATL_ANTLR3.g:53:5: ( 'drop' ) - // ATL_ANTLR3.g:53:7: 'drop' + int _type = T__67; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:54:7: ( 'drop' ) + // ATL_ANTLR3.g:54:9: 'drop' { match("drop"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T67 + // $ANTLR end "T__67" - // $ANTLR start T68 - public final void mT68() throws RecognitionException { + // $ANTLR start "T__68" + public final void mT__68() throws RecognitionException { try { - int _type = T68; - // ATL_ANTLR3.g:54:5: ( 'do' ) - // ATL_ANTLR3.g:54:7: 'do' + int _type = T__68; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:55:7: ( 'do' ) + // ATL_ANTLR3.g:55:9: 'do' { match("do"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T68 + // $ANTLR end "T__68" - // $ANTLR start T69 - public final void mT69() throws RecognitionException { + // $ANTLR start "T__69" + public final void mT__69() throws RecognitionException { try { - int _type = T69; - // ATL_ANTLR3.g:55:5: ( 'if' ) - // ATL_ANTLR3.g:55:7: 'if' + int _type = T__69; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:56:7: ( 'if' ) + // ATL_ANTLR3.g:56:9: 'if' { match("if"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T69 + // $ANTLR end "T__69" - // $ANTLR start T70 - public final void mT70() throws RecognitionException { + // $ANTLR start "T__70" + public final void mT__70() throws RecognitionException { try { - int _type = T70; - // ATL_ANTLR3.g:56:5: ( 'else' ) - // ATL_ANTLR3.g:56:7: 'else' + int _type = T__70; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:57:7: ( 'else' ) + // ATL_ANTLR3.g:57:9: 'else' { match("else"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T70 + // $ANTLR end "T__70" - // $ANTLR start T71 - public final void mT71() throws RecognitionException { + // $ANTLR start "T__71" + public final void mT__71() throws RecognitionException { try { - int _type = T71; - // ATL_ANTLR3.g:57:5: ( 'for' ) - // ATL_ANTLR3.g:57:7: 'for' + int _type = T__71; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:58:7: ( 'for' ) + // ATL_ANTLR3.g:58:9: 'for' { match("for"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T71 + // $ANTLR end "T__71" - // $ANTLR start T72 - public final void mT72() throws RecognitionException { + // $ANTLR start "T__72" + public final void mT__72() throws RecognitionException { try { - int _type = T72; - // ATL_ANTLR3.g:58:5: ( 'iterate' ) - // ATL_ANTLR3.g:58:7: 'iterate' + int _type = T__72; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:59:7: ( 'iterate' ) + // ATL_ANTLR3.g:59:9: 'iterate' { match("iterate"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T72 + // $ANTLR end "T__72" - // $ANTLR start T73 - public final void mT73() throws RecognitionException { + // $ANTLR start "T__73" + public final void mT__73() throws RecognitionException { try { - int _type = T73; - // ATL_ANTLR3.g:59:5: ( 'OclUndefined' ) - // ATL_ANTLR3.g:59:7: 'OclUndefined' + int _type = T__73; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:60:7: ( 'OclUndefined' ) + // ATL_ANTLR3.g:60:9: 'OclUndefined' { match("OclUndefined"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T73 + // $ANTLR end "T__73" - // $ANTLR start T74 - public final void mT74() throws RecognitionException { + // $ANTLR start "T__74" + public final void mT__74() throws RecognitionException { try { - int _type = T74; - // ATL_ANTLR3.g:60:5: ( 'true' ) - // ATL_ANTLR3.g:60:7: 'true' + int _type = T__74; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:61:7: ( 'true' ) + // ATL_ANTLR3.g:61:9: 'true' { match("true"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T74 + // $ANTLR end "T__74" - // $ANTLR start T75 - public final void mT75() throws RecognitionException { + // $ANTLR start "T__75" + public final void mT__75() throws RecognitionException { try { - int _type = T75; - // ATL_ANTLR3.g:61:5: ( 'false' ) - // ATL_ANTLR3.g:61:7: 'false' + int _type = T__75; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:62:7: ( 'false' ) + // ATL_ANTLR3.g:62:9: 'false' { match("false"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T75 + // $ANTLR end "T__75" - // $ANTLR start T76 - public final void mT76() throws RecognitionException { + // $ANTLR start "T__76" + public final void mT__76() throws RecognitionException { try { - int _type = T76; - // ATL_ANTLR3.g:62:5: ( 'then' ) - // ATL_ANTLR3.g:62:7: 'then' + int _type = T__76; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:63:7: ( 'then' ) + // ATL_ANTLR3.g:63:9: 'then' { match("then"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T76 + // $ANTLR end "T__76" - // $ANTLR start T77 - public final void mT77() throws RecognitionException { + // $ANTLR start "T__77" + public final void mT__77() throws RecognitionException { try { - int _type = T77; - // ATL_ANTLR3.g:63:5: ( 'endif' ) - // ATL_ANTLR3.g:63:7: 'endif' + int _type = T__77; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:64:7: ( 'endif' ) + // ATL_ANTLR3.g:64:9: 'endif' { match("endif"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T77 + // $ANTLR end "T__77" - // $ANTLR start T78 - public final void mT78() throws RecognitionException { + // $ANTLR start "T__78" + public final void mT__78() throws RecognitionException { try { - int _type = T78; - // ATL_ANTLR3.g:64:5: ( 'super' ) - // ATL_ANTLR3.g:64:7: 'super' + int _type = T__78; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:65:7: ( 'super' ) + // ATL_ANTLR3.g:65:9: 'super' { match("super"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T78 + // $ANTLR end "T__78" - // $ANTLR start T79 - public final void mT79() throws RecognitionException { + // $ANTLR start "T__79" + public final void mT__79() throws RecognitionException { try { - int _type = T79; - // ATL_ANTLR3.g:65:5: ( 'let' ) - // ATL_ANTLR3.g:65:7: 'let' + int _type = T__79; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:66:7: ( 'let' ) + // ATL_ANTLR3.g:66:9: 'let' { match("let"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T79 + // $ANTLR end "T__79" - // $ANTLR start T80 - public final void mT80() throws RecognitionException { + // $ANTLR start "T__80" + public final void mT__80() throws RecognitionException { try { - int _type = T80; - // ATL_ANTLR3.g:66:5: ( 'Bag' ) - // ATL_ANTLR3.g:66:7: 'Bag' + int _type = T__80; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:67:7: ( 'Bag' ) + // ATL_ANTLR3.g:67:9: 'Bag' { match("Bag"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T80 + // $ANTLR end "T__80" - // $ANTLR start T81 - public final void mT81() throws RecognitionException { + // $ANTLR start "T__81" + public final void mT__81() throws RecognitionException { try { - int _type = T81; - // ATL_ANTLR3.g:67:5: ( 'Set' ) - // ATL_ANTLR3.g:67:7: 'Set' + int _type = T__81; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:68:7: ( 'Set' ) + // ATL_ANTLR3.g:68:9: 'Set' { match("Set"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T81 + // $ANTLR end "T__81" - // $ANTLR start T82 - public final void mT82() throws RecognitionException { + // $ANTLR start "T__82" + public final void mT__82() throws RecognitionException { try { - int _type = T82; - // ATL_ANTLR3.g:68:5: ( 'OrderedSet' ) - // ATL_ANTLR3.g:68:7: 'OrderedSet' + int _type = T__82; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:69:7: ( 'OrderedSet' ) + // ATL_ANTLR3.g:69:9: 'OrderedSet' { match("OrderedSet"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T82 + // $ANTLR end "T__82" - // $ANTLR start T83 - public final void mT83() throws RecognitionException { + // $ANTLR start "T__83" + public final void mT__83() throws RecognitionException { try { - int _type = T83; - // ATL_ANTLR3.g:69:5: ( 'Sequence' ) - // ATL_ANTLR3.g:69:7: 'Sequence' + int _type = T__83; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:70:7: ( 'Sequence' ) + // ATL_ANTLR3.g:70:9: 'Sequence' { match("Sequence"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T83 + // $ANTLR end "T__83" - // $ANTLR start T84 - public final void mT84() throws RecognitionException { + // $ANTLR start "T__84" + public final void mT__84() throws RecognitionException { try { - int _type = T84; - // ATL_ANTLR3.g:70:5: ( 'Map' ) - // ATL_ANTLR3.g:70:7: 'Map' + int _type = T__84; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:71:7: ( 'Map' ) + // ATL_ANTLR3.g:71:9: 'Map' { match("Map"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T84 + // $ANTLR end "T__84" - // $ANTLR start T85 - public final void mT85() throws RecognitionException { + // $ANTLR start "T__85" + public final void mT__85() throws RecognitionException { try { - int _type = T85; - // ATL_ANTLR3.g:71:5: ( 'Tuple' ) - // ATL_ANTLR3.g:71:7: 'Tuple' + int _type = T__85; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:72:7: ( 'Tuple' ) + // ATL_ANTLR3.g:72:9: 'Tuple' { match("Tuple"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T85 + // $ANTLR end "T__85" - // $ANTLR start T86 - public final void mT86() throws RecognitionException { + // $ANTLR start "T__86" + public final void mT__86() throws RecognitionException { try { - int _type = T86; - // ATL_ANTLR3.g:72:5: ( 'OclType' ) - // ATL_ANTLR3.g:72:7: 'OclType' + int _type = T__86; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:73:7: ( 'OclType' ) + // ATL_ANTLR3.g:73:9: 'OclType' { match("OclType"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T86 + // $ANTLR end "T__86" - // $ANTLR start T87 - public final void mT87() throws RecognitionException { + // $ANTLR start "T__87" + public final void mT__87() throws RecognitionException { try { - int _type = T87; - // ATL_ANTLR3.g:73:5: ( 'OclAny' ) - // ATL_ANTLR3.g:73:7: 'OclAny' + int _type = T__87; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:74:7: ( 'OclAny' ) + // ATL_ANTLR3.g:74:9: 'OclAny' { match("OclAny"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T87 + // $ANTLR end "T__87" - // $ANTLR start T88 - public final void mT88() throws RecognitionException { + // $ANTLR start "T__88" + public final void mT__88() throws RecognitionException { try { - int _type = T88; - // ATL_ANTLR3.g:74:5: ( 'TupleType' ) - // ATL_ANTLR3.g:74:7: 'TupleType' + int _type = T__88; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:75:7: ( 'TupleType' ) + // ATL_ANTLR3.g:75:9: 'TupleType' { match("TupleType"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T88 + // $ANTLR end "T__88" - // $ANTLR start T89 - public final void mT89() throws RecognitionException { + // $ANTLR start "T__89" + public final void mT__89() throws RecognitionException { try { - int _type = T89; - // ATL_ANTLR3.g:75:5: ( 'Integer' ) - // ATL_ANTLR3.g:75:7: 'Integer' + int _type = T__89; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:76:7: ( 'Integer' ) + // ATL_ANTLR3.g:76:9: 'Integer' { match("Integer"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T89 + // $ANTLR end "T__89" - // $ANTLR start T90 - public final void mT90() throws RecognitionException { + // $ANTLR start "T__90" + public final void mT__90() throws RecognitionException { try { - int _type = T90; - // ATL_ANTLR3.g:76:5: ( 'Real' ) - // ATL_ANTLR3.g:76:7: 'Real' + int _type = T__90; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:77:7: ( 'Real' ) + // ATL_ANTLR3.g:77:9: 'Real' { match("Real"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T90 + // $ANTLR end "T__90" - // $ANTLR start T91 - public final void mT91() throws RecognitionException { + // $ANTLR start "T__91" + public final void mT__91() throws RecognitionException { try { - int _type = T91; - // ATL_ANTLR3.g:77:5: ( 'Boolean' ) - // ATL_ANTLR3.g:77:7: 'Boolean' + int _type = T__91; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:78:7: ( 'Boolean' ) + // ATL_ANTLR3.g:78:9: 'Boolean' { match("Boolean"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T91 + // $ANTLR end "T__91" - // $ANTLR start T92 - public final void mT92() throws RecognitionException { + // $ANTLR start "T__92" + public final void mT__92() throws RecognitionException { try { - int _type = T92; - // ATL_ANTLR3.g:78:5: ( 'String' ) - // ATL_ANTLR3.g:78:7: 'String' + int _type = T__92; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:79:7: ( 'String' ) + // ATL_ANTLR3.g:79:9: 'String' { match("String"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T92 + // $ANTLR end "T__92" - // $ANTLR start T93 - public final void mT93() throws RecognitionException { + // $ANTLR start "T__93" + public final void mT__93() throws RecognitionException { try { - int _type = T93; - // ATL_ANTLR3.g:79:5: ( 'Collection' ) - // ATL_ANTLR3.g:79:7: 'Collection' + int _type = T__93; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:80:7: ( 'Collection' ) + // ATL_ANTLR3.g:80:9: 'Collection' { match("Collection"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T93 + // $ANTLR end "T__93" - // $ANTLR start T94 - public final void mT94() throws RecognitionException { + // $ANTLR start "T__94" + public final void mT__94() throws RecognitionException { try { - int _type = T94; - // ATL_ANTLR3.g:80:5: ( 'not' ) - // ATL_ANTLR3.g:80:7: 'not' + int _type = T__94; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:81:7: ( 'not' ) + // ATL_ANTLR3.g:81:9: 'not' { match("not"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T94 + // $ANTLR end "T__94" - // $ANTLR start T95 - public final void mT95() throws RecognitionException { + // $ANTLR start "T__95" + public final void mT__95() throws RecognitionException { try { - int _type = T95; - // ATL_ANTLR3.g:81:5: ( 'div' ) - // ATL_ANTLR3.g:81:7: 'div' + int _type = T__95; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:82:7: ( 'div' ) + // ATL_ANTLR3.g:82:9: 'div' { match("div"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T95 + // $ANTLR end "T__95" - // $ANTLR start T96 - public final void mT96() throws RecognitionException { + // $ANTLR start "T__96" + public final void mT__96() throws RecognitionException { try { - int _type = T96; - // ATL_ANTLR3.g:82:5: ( 'mod' ) - // ATL_ANTLR3.g:82:7: 'mod' + int _type = T__96; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:83:7: ( 'mod' ) + // ATL_ANTLR3.g:83:9: 'mod' { match("mod"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T96 + // $ANTLR end "T__96" - // $ANTLR start T97 - public final void mT97() throws RecognitionException { + // $ANTLR start "T__97" + public final void mT__97() throws RecognitionException { try { - int _type = T97; - // ATL_ANTLR3.g:83:5: ( 'and' ) - // ATL_ANTLR3.g:83:7: 'and' + int _type = T__97; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:84:7: ( 'and' ) + // ATL_ANTLR3.g:84:9: 'and' { match("and"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T97 + // $ANTLR end "T__97" - // $ANTLR start T98 - public final void mT98() throws RecognitionException { + // $ANTLR start "T__98" + public final void mT__98() throws RecognitionException { try { - int _type = T98; - // ATL_ANTLR3.g:84:5: ( 'or' ) - // ATL_ANTLR3.g:84:7: 'or' + int _type = T__98; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:85:7: ( 'or' ) + // ATL_ANTLR3.g:85:9: 'or' { match("or"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T98 + // $ANTLR end "T__98" - // $ANTLR start T99 - public final void mT99() throws RecognitionException { + // $ANTLR start "T__99" + public final void mT__99() throws RecognitionException { try { - int _type = T99; - // ATL_ANTLR3.g:85:5: ( 'xor' ) - // ATL_ANTLR3.g:85:7: 'xor' + int _type = T__99; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:86:7: ( 'xor' ) + // ATL_ANTLR3.g:86:9: 'xor' { match("xor"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T99 + // $ANTLR end "T__99" - // $ANTLR start T100 - public final void mT100() throws RecognitionException { + // $ANTLR start "T__100" + public final void mT__100() throws RecognitionException { try { - int _type = T100; - // ATL_ANTLR3.g:86:6: ( 'implies' ) - // ATL_ANTLR3.g:86:8: 'implies' + int _type = T__100; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:87:8: ( 'implies' ) + // ATL_ANTLR3.g:87:10: 'implies' { match("implies"); } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end T100 + // $ANTLR end "T__100" - // $ANTLR start NL + // $ANTLR start "NL" public final void mNL() throws RecognitionException { try { int _type = NL; + int _channel = DEFAULT_TOKEN_CHANNEL; // ATL_ANTLR3.g:1090:2: ( ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' ) ) // ATL_ANTLR3.g:1090:4: ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' ) { @@ -1281,7 +1394,7 @@ public class ATL_ANTLR3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("1090:4: ( '\\r' '\\n' | '\\n' '\\r' | '\\r' | '\\n' )", 1, 0, input); + new NoViableAltException("", 1, 0, input); throw nvae; } @@ -1323,17 +1436,19 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end NL + // $ANTLR end "NL" - // $ANTLR start WS + // $ANTLR start "WS" public final void mWS() throws RecognitionException { try { int _type = WS; + int _channel = DEFAULT_TOKEN_CHANNEL; // ATL_ANTLR3.g:1099:2: ( ( ' ' | '\\t' ) ) // ATL_ANTLR3.g:1099:4: ( ' ' | '\\t' ) { @@ -1342,22 +1457,22 @@ public class ATL_ANTLR3Lexer extends Lexer { } else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end WS + // $ANTLR end "WS" - // $ANTLR start DIGIT + // $ANTLR start "DIGIT" public final void mDIGIT() throws RecognitionException { try { // ATL_ANTLR3.g:1106:2: ( '0' .. '9' ) @@ -1371,9 +1486,9 @@ public class ATL_ANTLR3Lexer extends Lexer { finally { } } - // $ANTLR end DIGIT + // $ANTLR end "DIGIT" - // $ANTLR start ALPHA + // $ANTLR start "ALPHA" public final void mALPHA() throws RecognitionException { try { // ATL_ANTLR3.g:1111:2: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '\\u00C0' .. '\\u00D6' | '\\u00D8' .. '\\u00F6' | '\\u00F8' .. '\\u00FF' ) @@ -1384,10 +1499,9 @@ public class ATL_ANTLR3Lexer extends Lexer { } else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } @@ -1396,9 +1510,9 @@ public class ATL_ANTLR3Lexer extends Lexer { finally { } } - // $ANTLR end ALPHA + // $ANTLR end "ALPHA" - // $ANTLR start SNAME + // $ANTLR start "SNAME" public final void mSNAME() throws RecognitionException { try { // ATL_ANTLR3.g:1127:2: ( ( ALPHA ) ( ALPHA | DIGIT )* ) @@ -1431,10 +1545,9 @@ public class ATL_ANTLR3Lexer extends Lexer { } else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } @@ -1452,12 +1565,13 @@ public class ATL_ANTLR3Lexer extends Lexer { finally { } } - // $ANTLR end SNAME + // $ANTLR end "SNAME" - // $ANTLR start NAME + // $ANTLR start "NAME" public final void mNAME() throws RecognitionException { try { int _type = NAME; + int _channel = DEFAULT_TOKEN_CHANNEL; // ATL_ANTLR3.g:1131:2: ( ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' ) ) // ATL_ANTLR3.g:1131:4: ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' ) { @@ -1473,7 +1587,7 @@ public class ATL_ANTLR3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("1131:4: ( SNAME | '\"' ( ESC | '\\n' | ~ ( '\\\\' | '\\\"' | '\\n' ) )* '\"' )", 4, 0, input); + new NoViableAltException("", 4, 0, input); throw nvae; } @@ -1501,7 +1615,7 @@ public class ATL_ANTLR3Lexer extends Lexer { else if ( (LA3_0=='\n') ) { alt3=2; } - else if ( ((LA3_0>='\u0000' && LA3_0<='\t')||(LA3_0>='\u000B' && LA3_0<='!')||(LA3_0>='#' && LA3_0<='[')||(LA3_0>=']' && LA3_0<='\uFFFE')) ) { + else if ( ((LA3_0>='\u0000' && LA3_0<='\t')||(LA3_0>='\u000B' && LA3_0<='!')||(LA3_0>='#' && LA3_0<='[')||(LA3_0>=']' && LA3_0<='\uFFFF')) ) { alt3=3; } @@ -1525,15 +1639,14 @@ public class ATL_ANTLR3Lexer extends Lexer { case 3 : // ATL_ANTLR3.g:1137:6: ~ ( '\\\\' | '\\\"' | '\\n' ) { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { + if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); } else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } @@ -1555,17 +1668,19 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end NAME + // $ANTLR end "NAME" - // $ANTLR start INT + // $ANTLR start "INT" public final void mINT() throws RecognitionException { try { int _type = INT; + int _channel = DEFAULT_TOKEN_CHANNEL; // ATL_ANTLR3.g:1145:8: ( ( DIGIT )+ ( | {...}? => '.' ( DIGIT )+ ) ) // ATL_ANTLR3.g:1145:16: ( DIGIT )+ ( | {...}? => '.' ( DIGIT )+ ) { @@ -1603,7 +1718,7 @@ public class ATL_ANTLR3Lexer extends Lexer { int alt7=2; int LA7_0 = input.LA(1); - if ( (LA7_0=='.') && ( ((input.LA(2) >= '0') && (input.LA(2) <= '9')) )) { + if ( (LA7_0=='.') && (( ((input.LA(2) >= '0') && (input.LA(2) <= '9')) ))) { alt7=2; } else { @@ -1617,7 +1732,7 @@ public class ATL_ANTLR3Lexer extends Lexer { case 2 : // ATL_ANTLR3.g:1148:16: {...}? => '.' ( DIGIT )+ { - if ( !( ((input.LA(2) >= '0') && (input.LA(2) <= '9')) ) ) { + if ( !(( ((input.LA(2) >= '0') && (input.LA(2) <= '9')) )) ) { throw new FailedPredicateException(input, "INT", " ((input.LA(2) >= '0') && (input.LA(2) <= '9')) "); } match('.'); @@ -1661,14 +1776,15 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end INT + // $ANTLR end "INT" - // $ANTLR start FLOAT + // $ANTLR start "FLOAT" public final void mFLOAT() throws RecognitionException { try { // ATL_ANTLR3.g:1150:15: () @@ -1680,9 +1796,9 @@ public class ATL_ANTLR3Lexer extends Lexer { finally { } } - // $ANTLR end FLOAT + // $ANTLR end "FLOAT" - // $ANTLR start ESC + // $ANTLR start "ESC" public final void mESC() throws RecognitionException { try { // ATL_ANTLR3.g:1154:2: ( '\\\\' ( 'n' | 'r' | 't' | 'b' | 'f' | '\"' | '\\'' | '\\\\' | ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) ) ) @@ -1746,7 +1862,7 @@ public class ATL_ANTLR3Lexer extends Lexer { break; default: NoViableAltException nvae = - new NoViableAltException("1155:3: ( 'n' | 'r' | 't' | 'b' | 'f' | '\"' | '\\'' | '\\\\' | ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? ) )", 12, 0, input); + new NoViableAltException("", 12, 0, input); throw nvae; } @@ -1823,7 +1939,7 @@ public class ATL_ANTLR3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("1163:5: ( ( '0' .. '3' ) ( ( '0' .. '7' ) ( '0' .. '7' )? )? | ( '4' .. '7' ) ( ( '0' .. '7' ) )? )", 11, 0, input); + new NoViableAltException("", 11, 0, input); throw nvae; } @@ -1923,7 +2039,7 @@ public class ATL_ANTLR3Lexer extends Lexer { } - + // String s = getText(); // int i; // int ret = 0; @@ -1946,14 +2062,145 @@ public class ATL_ANTLR3Lexer extends Lexer { finally { } } - // $ANTLR end ESC + // $ANTLR end "ESC" + + // $ANTLR start "STRING" + public final void mSTRING() throws RecognitionException { + try { + int _type = STRING; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1198:2: ( ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) ) + // ATL_ANTLR3.g:1198:4: ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) + { + // ATL_ANTLR3.g:1198:4: ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) + // ATL_ANTLR3.g:1198:5: ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) + { + // ATL_ANTLR3.g:1198:5: ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) + // ATL_ANTLR3.g:1198:6: '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' + { + match('\''); + // ATL_ANTLR3.g:1198:11: ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* + loop14: + do { + int alt14=2; + int LA14_0 = input.LA(1); + + if ( (LA14_0=='\'') ) { + alt14=2; + } + else if ( ((LA14_0>='\u0000' && LA14_0<='&')||(LA14_0>='(' && LA14_0<='\uFFFF')) ) { + alt14=1; + } + + + switch (alt14) { + case 1 : + // ATL_ANTLR3.g:1198:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) + { + // ATL_ANTLR3.g:1198:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) + int alt13=3; + int LA13_0 = input.LA(1); + + if ( (LA13_0=='\\') ) { + alt13=1; + } + else if ( (LA13_0=='\n') ) { + alt13=2; + } + else if ( ((LA13_0>='\u0000' && LA13_0<='\t')||(LA13_0>='\u000B' && LA13_0<='[')||(LA13_0>=']' && LA13_0<='\uFFFF')) ) { + alt13=3; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 13, 0, input); + + throw nvae; + } + switch (alt13) { + case 1 : + // ATL_ANTLR3.g:1198:41: ( '\\\\' ~ '\\n' ) + { + // ATL_ANTLR3.g:1198:41: ( '\\\\' ~ '\\n' ) + // ATL_ANTLR3.g:1198:42: '\\\\' ~ '\\n' + { + match('\\'); + if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\uFFFF') ) { + input.consume(); + + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} + + + } + + + } + break; + case 2 : + // ATL_ANTLR3.g:1198:56: '\\n' + { + match('\n'); + + } + break; + case 3 : + // ATL_ANTLR3.g:1198:62: ~ ( '\\\\' | '\\n' ) + { + if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { + input.consume(); + + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} + + + } + break; + + } + + + } + break; + + default : + break loop14; + } + } while (true); + + match('\''); - // $ANTLR start LSQUARE + } + + + } + + + + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "STRING" + + // $ANTLR start "LSQUARE" public final void mLSQUARE() throws RecognitionException { try { int _type = LSQUARE; - // ATL_ANTLR3.g:1200:2: ( '[' ) - // ATL_ANTLR3.g:1200:4: '[' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1207:2: ( '[' ) + // ATL_ANTLR3.g:1207:4: '[' { match('['); @@ -1962,19 +2209,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LSQUARE + // $ANTLR end "LSQUARE" - // $ANTLR start RSQUARE + // $ANTLR start "RSQUARE" public final void mRSQUARE() throws RecognitionException { try { int _type = RSQUARE; - // ATL_ANTLR3.g:1208:2: ( ']' ) - // ATL_ANTLR3.g:1208:4: ']' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1215:2: ( ']' ) + // ATL_ANTLR3.g:1215:4: ']' { match(']'); @@ -1983,19 +2232,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end RSQUARE + // $ANTLR end "RSQUARE" - // $ANTLR start EXCL + // $ANTLR start "EXCL" public final void mEXCL() throws RecognitionException { try { int _type = EXCL; - // ATL_ANTLR3.g:1216:2: ( '!' ) - // ATL_ANTLR3.g:1216:4: '!' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1223:2: ( '!' ) + // ATL_ANTLR3.g:1223:4: '!' { match('!'); @@ -2004,19 +2255,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end EXCL + // $ANTLR end "EXCL" - // $ANTLR start COMA + // $ANTLR start "COMA" public final void mCOMA() throws RecognitionException { try { int _type = COMA; - // ATL_ANTLR3.g:1224:2: ( ',' ) - // ATL_ANTLR3.g:1224:4: ',' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1231:2: ( ',' ) + // ATL_ANTLR3.g:1231:4: ',' { match(','); @@ -2025,19 +2278,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end COMA + // $ANTLR end "COMA" - // $ANTLR start LPAREN + // $ANTLR start "LPAREN" public final void mLPAREN() throws RecognitionException { try { int _type = LPAREN; - // ATL_ANTLR3.g:1232:2: ( '(' ) - // ATL_ANTLR3.g:1232:4: '(' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1239:2: ( '(' ) + // ATL_ANTLR3.g:1239:4: '(' { match('('); @@ -2046,19 +2301,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LPAREN + // $ANTLR end "LPAREN" - // $ANTLR start RPAREN + // $ANTLR start "RPAREN" public final void mRPAREN() throws RecognitionException { try { int _type = RPAREN; - // ATL_ANTLR3.g:1240:2: ( ')' ) - // ATL_ANTLR3.g:1240:4: ')' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1247:2: ( ')' ) + // ATL_ANTLR3.g:1247:4: ')' { match(')'); @@ -2067,19 +2324,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end RPAREN + // $ANTLR end "RPAREN" - // $ANTLR start LCURLY + // $ANTLR start "LCURLY" public final void mLCURLY() throws RecognitionException { try { int _type = LCURLY; - // ATL_ANTLR3.g:1248:2: ( '{' ) - // ATL_ANTLR3.g:1248:4: '{' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1255:2: ( '{' ) + // ATL_ANTLR3.g:1255:4: '{' { match('{'); @@ -2088,19 +2347,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LCURLY + // $ANTLR end "LCURLY" - // $ANTLR start RCURLY + // $ANTLR start "RCURLY" public final void mRCURLY() throws RecognitionException { try { int _type = RCURLY; - // ATL_ANTLR3.g:1256:2: ( '}' ) - // ATL_ANTLR3.g:1256:4: '}' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1263:2: ( '}' ) + // ATL_ANTLR3.g:1263:4: '}' { match('}'); @@ -2109,19 +2370,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end RCURLY + // $ANTLR end "RCURLY" - // $ANTLR start SEMI + // $ANTLR start "SEMI" public final void mSEMI() throws RecognitionException { try { int _type = SEMI; - // ATL_ANTLR3.g:1264:2: ( ';' ) - // ATL_ANTLR3.g:1264:4: ';' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1271:2: ( ';' ) + // ATL_ANTLR3.g:1271:4: ';' { match(';'); @@ -2130,19 +2393,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end SEMI + // $ANTLR end "SEMI" - // $ANTLR start COLON + // $ANTLR start "COLON" public final void mCOLON() throws RecognitionException { try { int _type = COLON; - // ATL_ANTLR3.g:1272:2: ( ':' ) - // ATL_ANTLR3.g:1272:4: ':' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1279:2: ( ':' ) + // ATL_ANTLR3.g:1279:4: ':' { match(':'); @@ -2151,19 +2416,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end COLON + // $ANTLR end "COLON" - // $ANTLR start PIPE + // $ANTLR start "PIPE" public final void mPIPE() throws RecognitionException { try { int _type = PIPE; - // ATL_ANTLR3.g:1280:2: ( '|' ) - // ATL_ANTLR3.g:1280:4: '|' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1287:2: ( '|' ) + // ATL_ANTLR3.g:1287:4: '|' { match('|'); @@ -2172,19 +2439,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end PIPE + // $ANTLR end "PIPE" - // $ANTLR start SHARP + // $ANTLR start "SHARP" public final void mSHARP() throws RecognitionException { try { int _type = SHARP; - // ATL_ANTLR3.g:1288:2: ( '#' ) - // ATL_ANTLR3.g:1288:4: '#' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1295:2: ( '#' ) + // ATL_ANTLR3.g:1295:4: '#' { match('#'); @@ -2193,19 +2462,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end SHARP + // $ANTLR end "SHARP" - // $ANTLR start QMARK + // $ANTLR start "QMARK" public final void mQMARK() throws RecognitionException { try { int _type = QMARK; - // ATL_ANTLR3.g:1296:2: ( '?' ) - // ATL_ANTLR3.g:1296:4: '?' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1303:2: ( '?' ) + // ATL_ANTLR3.g:1303:4: '?' { match('?'); @@ -2214,19 +2485,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end QMARK + // $ANTLR end "QMARK" - // $ANTLR start AROBAS + // $ANTLR start "AROBAS" public final void mAROBAS() throws RecognitionException { try { int _type = AROBAS; - // ATL_ANTLR3.g:1304:2: ( '@' ) - // ATL_ANTLR3.g:1304:4: '@' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1311:2: ( '@' ) + // ATL_ANTLR3.g:1311:4: '@' { match('@'); @@ -2235,19 +2508,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end AROBAS + // $ANTLR end "AROBAS" - // $ANTLR start POINT + // $ANTLR start "POINT" public final void mPOINT() throws RecognitionException { try { int _type = POINT; - // ATL_ANTLR3.g:1312:2: ( '.' ) - // ATL_ANTLR3.g:1312:4: '.' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1319:2: ( '.' ) + // ATL_ANTLR3.g:1319:4: '.' { match('.'); @@ -2256,19 +2531,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end POINT + // $ANTLR end "POINT" - // $ANTLR start RARROW + // $ANTLR start "RARROW" public final void mRARROW() throws RecognitionException { try { int _type = RARROW; - // ATL_ANTLR3.g:1320:2: ( '->' ) - // ATL_ANTLR3.g:1320:4: '->' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1327:2: ( '->' ) + // ATL_ANTLR3.g:1327:4: '->' { match("->"); @@ -2278,19 +2555,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end RARROW + // $ANTLR end "RARROW" - // $ANTLR start MINUS + // $ANTLR start "MINUS" public final void mMINUS() throws RecognitionException { try { int _type = MINUS; - // ATL_ANTLR3.g:1328:2: ( '-' ) - // ATL_ANTLR3.g:1328:4: '-' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1335:2: ( '-' ) + // ATL_ANTLR3.g:1335:4: '-' { match('-'); @@ -2299,19 +2578,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end MINUS + // $ANTLR end "MINUS" - // $ANTLR start STAR + // $ANTLR start "STAR" public final void mSTAR() throws RecognitionException { try { int _type = STAR; - // ATL_ANTLR3.g:1336:2: ( '*' ) - // ATL_ANTLR3.g:1336:4: '*' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1343:2: ( '*' ) + // ATL_ANTLR3.g:1343:4: '*' { match('*'); @@ -2320,19 +2601,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end STAR + // $ANTLR end "STAR" - // $ANTLR start SLASH + // $ANTLR start "SLASH" public final void mSLASH() throws RecognitionException { try { int _type = SLASH; - // ATL_ANTLR3.g:1344:2: ( '/' ) - // ATL_ANTLR3.g:1344:4: '/' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1351:2: ( '/' ) + // ATL_ANTLR3.g:1351:4: '/' { match('/'); @@ -2341,19 +2624,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end SLASH + // $ANTLR end "SLASH" - // $ANTLR start PLUS + // $ANTLR start "PLUS" public final void mPLUS() throws RecognitionException { try { int _type = PLUS; - // ATL_ANTLR3.g:1352:2: ( '+' ) - // ATL_ANTLR3.g:1352:4: '+' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1359:2: ( '+' ) + // ATL_ANTLR3.g:1359:4: '+' { match('+'); @@ -2362,19 +2647,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end PLUS + // $ANTLR end "PLUS" - // $ANTLR start EQ + // $ANTLR start "EQ" public final void mEQ() throws RecognitionException { try { int _type = EQ; - // ATL_ANTLR3.g:1360:2: ( '=' ) - // ATL_ANTLR3.g:1360:4: '=' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1367:2: ( '=' ) + // ATL_ANTLR3.g:1367:4: '=' { match('='); @@ -2383,19 +2670,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end EQ + // $ANTLR end "EQ" - // $ANTLR start GT + // $ANTLR start "GT" public final void mGT() throws RecognitionException { try { int _type = GT; - // ATL_ANTLR3.g:1368:2: ( '>' ) - // ATL_ANTLR3.g:1368:4: '>' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1375:2: ( '>' ) + // ATL_ANTLR3.g:1375:4: '>' { match('>'); @@ -2404,19 +2693,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end GT + // $ANTLR end "GT" - // $ANTLR start LT + // $ANTLR start "LT" public final void mLT() throws RecognitionException { try { int _type = LT; - // ATL_ANTLR3.g:1376:2: ( '<' ) - // ATL_ANTLR3.g:1376:4: '<' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1383:2: ( '<' ) + // ATL_ANTLR3.g:1383:4: '<' { match('<'); @@ -2425,19 +2716,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LT + // $ANTLR end "LT" - // $ANTLR start GE + // $ANTLR start "GE" public final void mGE() throws RecognitionException { try { int _type = GE; - // ATL_ANTLR3.g:1384:2: ( '>=' ) - // ATL_ANTLR3.g:1384:4: '>=' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1391:2: ( '>=' ) + // ATL_ANTLR3.g:1391:4: '>=' { match(">="); @@ -2447,19 +2740,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end GE + // $ANTLR end "GE" - // $ANTLR start LE + // $ANTLR start "LE" public final void mLE() throws RecognitionException { try { int _type = LE; - // ATL_ANTLR3.g:1392:2: ( '<=' ) - // ATL_ANTLR3.g:1392:4: '<=' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1399:2: ( '<=' ) + // ATL_ANTLR3.g:1399:4: '<=' { match("<="); @@ -2469,19 +2764,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LE + // $ANTLR end "LE" - // $ANTLR start NE + // $ANTLR start "NE" public final void mNE() throws RecognitionException { try { int _type = NE; - // ATL_ANTLR3.g:1400:2: ( '<>' ) - // ATL_ANTLR3.g:1400:4: '<>' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1407:2: ( '<>' ) + // ATL_ANTLR3.g:1407:4: '<>' { match("<>"); @@ -2491,19 +2788,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end NE + // $ANTLR end "NE" - // $ANTLR start LARROW + // $ANTLR start "LARROW" public final void mLARROW() throws RecognitionException { try { int _type = LARROW; - // ATL_ANTLR3.g:1408:2: ( '<-' ) - // ATL_ANTLR3.g:1408:4: '<-' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1415:2: ( '<-' ) + // ATL_ANTLR3.g:1415:4: '<-' { match("<-"); @@ -2513,19 +2812,21 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end LARROW + // $ANTLR end "LARROW" - // $ANTLR start ASSIGNARROW + // $ANTLR start "ASSIGNARROW" public final void mASSIGNARROW() throws RecognitionException { try { int _type = ASSIGNARROW; - // ATL_ANTLR3.g:1416:2: ( '<:=' ) - // ATL_ANTLR3.g:1416:4: '<:=' + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1423:2: ( '<:=' ) + // ATL_ANTLR3.g:1423:4: '<:=' { match("<:="); @@ -2535,181 +2836,53 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end ASSIGNARROW + // $ANTLR end "ASSIGNARROW" - // $ANTLR start COMMENT + // $ANTLR start "COMMENT" public final void mCOMMENT() throws RecognitionException { try { int _type = COMMENT; - // ATL_ANTLR3.g:1424:2: ( ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) ) - // ATL_ANTLR3.g:1424:4: ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) + int _channel = DEFAULT_TOKEN_CHANNEL; + // ATL_ANTLR3.g:1431:2: ( ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) ) + // ATL_ANTLR3.g:1431:4: ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) { - // ATL_ANTLR3.g:1424:4: ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) - // ATL_ANTLR3.g:1424:5: ( '--' (~ ( '\\r' | '\\n' ) )* ) + // ATL_ANTLR3.g:1431:4: ( ( '--' (~ ( '\\r' | '\\n' ) )* ) ) + // ATL_ANTLR3.g:1431:5: ( '--' (~ ( '\\r' | '\\n' ) )* ) { - // ATL_ANTLR3.g:1424:5: ( '--' (~ ( '\\r' | '\\n' ) )* ) - // ATL_ANTLR3.g:1424:6: '--' (~ ( '\\r' | '\\n' ) )* + // ATL_ANTLR3.g:1431:5: ( '--' (~ ( '\\r' | '\\n' ) )* ) + // ATL_ANTLR3.g:1431:6: '--' (~ ( '\\r' | '\\n' ) )* { match("--"); - // ATL_ANTLR3.g:1424:11: (~ ( '\\r' | '\\n' ) )* - loop13: - do { - int alt13=2; - int LA13_0 = input.LA(1); - - if ( ((LA13_0>='\u0000' && LA13_0<='\t')||(LA13_0>='\u000B' && LA13_0<='\f')||(LA13_0>='\u000E' && LA13_0<='\uFFFE')) ) { - alt13=1; - } - - - switch (alt13) { - case 1 : - // ATL_ANTLR3.g:1424:12: ~ ( '\\r' | '\\n' ) - { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) { - input.consume(); - - } - else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } - - - } - break; - - default : - break loop13; - } - } while (true); - - - } - - - } - - - - - - } - - this.type = _type; - } - finally { - } - } - // $ANTLR end COMMENT - - // $ANTLR start STRING - public final void mSTRING() throws RecognitionException { - try { - int _type = STRING; - // ATL_ANTLR3.g:1432:2: ( ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) ) - // ATL_ANTLR3.g:1432:4: ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) - { - // ATL_ANTLR3.g:1432:4: ( ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) ) - // ATL_ANTLR3.g:1432:5: ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) - { - // ATL_ANTLR3.g:1432:5: ( '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' ) - // ATL_ANTLR3.g:1432:6: '\\'' ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* '\\'' - { - match('\''); - // ATL_ANTLR3.g:1432:11: ( options {greedy=false; } : ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) )* + // ATL_ANTLR3.g:1431:11: (~ ( '\\r' | '\\n' ) )* loop15: do { int alt15=2; int LA15_0 = input.LA(1); - if ( (LA15_0=='\'') ) { - alt15=2; - } - else if ( ((LA15_0>='\u0000' && LA15_0<='&')||(LA15_0>='(' && LA15_0<='\uFFFE')) ) { + if ( ((LA15_0>='\u0000' && LA15_0<='\t')||(LA15_0>='\u000B' && LA15_0<='\f')||(LA15_0>='\u000E' && LA15_0<='\uFFFF')) ) { alt15=1; } switch (alt15) { case 1 : - // ATL_ANTLR3.g:1432:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) + // ATL_ANTLR3.g:1431:12: ~ ( '\\r' | '\\n' ) { - // ATL_ANTLR3.g:1432:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) ) - int alt14=3; - int LA14_0 = input.LA(1); + if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { + input.consume(); - if ( (LA14_0=='\\') ) { - alt14=1; - } - else if ( (LA14_0=='\n') ) { - alt14=2; - } - else if ( ((LA14_0>='\u0000' && LA14_0<='\t')||(LA14_0>='\u000B' && LA14_0<='[')||(LA14_0>=']' && LA14_0<='\uFFFE')) ) { - alt14=3; } else { - NoViableAltException nvae = - new NoViableAltException("1432:40: ( ( '\\\\' ~ '\\n' ) | '\\n' | ~ ( '\\\\' | '\\n' ) )", 14, 0, input); - - throw nvae; - } - switch (alt14) { - case 1 : - // ATL_ANTLR3.g:1432:41: ( '\\\\' ~ '\\n' ) - { - // ATL_ANTLR3.g:1432:41: ( '\\\\' ~ '\\n' ) - // ATL_ANTLR3.g:1432:42: '\\\\' ~ '\\n' - { - match('\\'); - if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\uFFFE') ) { - input.consume(); - - } - else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } - - - } - - - } - break; - case 2 : - // ATL_ANTLR3.g:1432:57: '\\n' - { - match('\n'); - - } - break; - case 3 : - // ATL_ANTLR3.g:1432:63: ~ ( '\\\\' | '\\n' ) - { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { - input.consume(); - - } - else { - MismatchedSetException mse = - new MismatchedSetException(null,input); - recover(mse); throw mse; - } - - - } - break; - - } + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} } @@ -2720,7 +2893,6 @@ public class ATL_ANTLR3Lexer extends Lexer { } } while (true); - match('\''); } @@ -2733,3223 +2905,660 @@ public class ATL_ANTLR3Lexer extends Lexer { } - this.type = _type; + state.type = _type; + state.channel = _channel; } finally { } } - // $ANTLR end STRING + // $ANTLR end "COMMENT" public void mTokens() throws RecognitionException { - // ATL_ANTLR3.g:1:8: ( T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | NL | WS | NAME | INT | LSQUARE | RSQUARE | EXCL | COMA | LPAREN | RPAREN | LCURLY | RCURLY | SEMI | COLON | PIPE | SHARP | QMARK | AROBAS | POINT | RARROW | MINUS | STAR | SLASH | PLUS | EQ | GT | LT | GE | LE | NE | LARROW | ASSIGNARROW | COMMENT | STRING ) + // ATL_ANTLR3.g:1:8: ( T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | NL | WS | NAME | INT | STRING | LSQUARE | RSQUARE | EXCL | COMA | LPAREN | RPAREN | LCURLY | RCURLY | SEMI | COLON | PIPE | SHARP | QMARK | AROBAS | POINT | RARROW | MINUS | STAR | SLASH | PLUS | EQ | GT | LT | GE | LE | NE | LARROW | ASSIGNARROW | COMMENT ) int alt16=92; - switch ( input.LA(1) ) { - case 'm': - { - switch ( input.LA(2) ) { - case 'o': - { - int LA16_53 = input.LA(3); - - if ( (LA16_53=='d') ) { - switch ( input.LA(4) ) { - case 'u': - { - int LA16_162 = input.LA(5); - - if ( (LA16_162=='l') ) { - int LA16_214 = input.LA(6); - - if ( (LA16_214=='e') ) { - int LA16_255 = input.LA(7); - - if ( ((LA16_255>='0' && LA16_255<='9')||(LA16_255>='A' && LA16_255<='Z')||LA16_255=='_'||(LA16_255>='a' && LA16_255<='z')||(LA16_255>='\u00C0' && LA16_255<='\u00D6')||(LA16_255>='\u00D8' && LA16_255<='\u00F6')||(LA16_255>='\u00F8' && LA16_255<='\u00FF')) ) { - alt16=61; - } - else { - alt16=1;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case 'A': - case 'B': - case 'C': - case 'D': - case 'E': - case 'F': - case 'G': - case 'H': - case 'I': - case 'J': - case 'K': - case 'L': - case 'M': - case 'N': - case 'O': - case 'P': - case 'Q': - case 'R': - case 'S': - case 'T': - case 'U': - case 'V': - case 'W': - case 'X': - case 'Y': - case 'Z': - case '_': - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': - case '\u00C0': - case '\u00C1': - case '\u00C2': - case '\u00C3': - case '\u00C4': - case '\u00C5': - case '\u00C6': - case '\u00C7': - case '\u00C8': - case '\u00C9': - case '\u00CA': - case '\u00CB': - case '\u00CC': - case '\u00CD': - case '\u00CE': - case '\u00CF': - case '\u00D0': - case '\u00D1': - case '\u00D2': - case '\u00D3': - case '\u00D4': - case '\u00D5': - case '\u00D6': - case '\u00D8': - case '\u00D9': - case '\u00DA': - case '\u00DB': - case '\u00DC': - case '\u00DD': - case '\u00DE': - case '\u00DF': - case '\u00E0': - case '\u00E1': - case '\u00E2': - case '\u00E3': - case '\u00E4': - case '\u00E5': - case '\u00E6': - case '\u00E7': - case '\u00E8': - case '\u00E9': - case '\u00EA': - case '\u00EB': - case '\u00EC': - case '\u00ED': - case '\u00EE': - case '\u00EF': - case '\u00F0': - case '\u00F1': - case '\u00F2': - case '\u00F3': - case '\u00F4': - case '\u00F5': - case '\u00F6': - case '\u00F8': - case '\u00F9': - case '\u00FA': - case '\u00FB': - case '\u00FC': - case '\u00FD': - case '\u00FE': - case '\u00FF': - { - alt16=61; - } - break; - default: - alt16=54;} - - } - else { - alt16=61;} - } - break; - case 'a': - { - int LA16_54 = input.LA(3); - - if ( (LA16_54=='p') ) { - int LA16_111 = input.LA(4); - - if ( (LA16_111=='s') ) { - int LA16_164 = input.LA(5); - - if ( (LA16_164=='T') ) { - int LA16_215 = input.LA(6); - - if ( (LA16_215=='o') ) { - int LA16_256 = input.LA(7); - - if ( ((LA16_256>='0' && LA16_256<='9')||(LA16_256>='A' && LA16_256<='Z')||LA16_256=='_'||(LA16_256>='a' && LA16_256<='z')||(LA16_256>='\u00C0' && LA16_256<='\u00D6')||(LA16_256>='\u00D8' && LA16_256<='\u00F6')||(LA16_256>='\u00F8' && LA16_256<='\u00FF')) ) { - alt16=61; - } - else { - alt16=22;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'c': - { - switch ( input.LA(2) ) { - case 'r': - { - int LA16_55 = input.LA(3); - - if ( (LA16_55=='e') ) { - int LA16_112 = input.LA(4); - - if ( (LA16_112=='a') ) { - int LA16_165 = input.LA(5); - - if ( (LA16_165=='t') ) { - int LA16_216 = input.LA(6); - - if ( (LA16_216=='e') ) { - int LA16_257 = input.LA(7); - - if ( ((LA16_257>='0' && LA16_257<='9')||(LA16_257>='A' && LA16_257<='Z')||LA16_257=='_'||(LA16_257>='a' && LA16_257<='z')||(LA16_257>='\u00C0' && LA16_257<='\u00D6')||(LA16_257>='\u00D8' && LA16_257<='\u00F6')||(LA16_257>='\u00F8' && LA16_257<='\u00FF')) ) { - alt16=61; - } - else { - alt16=2;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'o': - { - int LA16_56 = input.LA(3); - - if ( (LA16_56=='n') ) { - int LA16_113 = input.LA(4); - - if ( (LA16_113=='t') ) { - int LA16_166 = input.LA(5); - - if ( (LA16_166=='e') ) { - int LA16_217 = input.LA(6); - - if ( (LA16_217=='x') ) { - int LA16_258 = input.LA(7); - - if ( (LA16_258=='t') ) { - int LA16_291 = input.LA(8); - - if ( ((LA16_291>='0' && LA16_291<='9')||(LA16_291>='A' && LA16_291<='Z')||LA16_291=='_'||(LA16_291>='a' && LA16_291<='z')||(LA16_291>='\u00C0' && LA16_291<='\u00D6')||(LA16_291>='\u00D8' && LA16_291<='\u00F6')||(LA16_291>='\u00F8' && LA16_291<='\u00FF')) ) { - alt16=61; - } - else { - alt16=10;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'r': - { - switch ( input.LA(2) ) { - case 'e': - { - int LA16_57 = input.LA(3); - - if ( (LA16_57=='f') ) { - int LA16_114 = input.LA(4); - - if ( (LA16_114=='i') ) { - int LA16_167 = input.LA(5); - - if ( (LA16_167=='n') ) { - int LA16_218 = input.LA(6); - - if ( (LA16_218=='i') ) { - int LA16_259 = input.LA(7); - - if ( (LA16_259=='n') ) { - int LA16_292 = input.LA(8); - - if ( (LA16_292=='g') ) { - int LA16_316 = input.LA(9); - - if ( ((LA16_316>='0' && LA16_316<='9')||(LA16_316>='A' && LA16_316<='Z')||LA16_316=='_'||(LA16_316>='a' && LA16_316<='z')||(LA16_316>='\u00C0' && LA16_316<='\u00D6')||(LA16_316>='\u00D8' && LA16_316<='\u00F6')||(LA16_316>='\u00F8' && LA16_316<='\u00FF')) ) { - alt16=61; - } - else { - alt16=3;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'u': - { - int LA16_58 = input.LA(3); - - if ( (LA16_58=='l') ) { - int LA16_115 = input.LA(4); - - if ( (LA16_115=='e') ) { - int LA16_168 = input.LA(5); - - if ( ((LA16_168>='0' && LA16_168<='9')||(LA16_168>='A' && LA16_168<='Z')||LA16_168=='_'||(LA16_168>='a' && LA16_168<='z')||(LA16_168>='\u00C0' && LA16_168<='\u00D6')||(LA16_168>='\u00D8' && LA16_168<='\u00F6')||(LA16_168>='\u00F8' && LA16_168<='\u00FF')) ) { - alt16=61; - } - else { - alt16=13;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'f': - { - switch ( input.LA(2) ) { - case 'r': - { - int LA16_59 = input.LA(3); - - if ( (LA16_59=='o') ) { - int LA16_116 = input.LA(4); - - if ( (LA16_116=='m') ) { - int LA16_169 = input.LA(5); - - if ( ((LA16_169>='0' && LA16_169<='9')||(LA16_169>='A' && LA16_169<='Z')||LA16_169=='_'||(LA16_169>='a' && LA16_169<='z')||(LA16_169>='\u00C0' && LA16_169<='\u00D6')||(LA16_169>='\u00D8' && LA16_169<='\u00F6')||(LA16_169>='\u00F8' && LA16_169<='\u00FF')) ) { - alt16=61; - } - else { - alt16=4;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'o': - { - int LA16_60 = input.LA(3); - - if ( (LA16_60=='r') ) { - switch ( input.LA(4) ) { - case 'e': - { - int LA16_170 = input.LA(5); - - if ( (LA16_170=='a') ) { - int LA16_221 = input.LA(6); - - if ( (LA16_221=='c') ) { - int LA16_260 = input.LA(7); - - if ( (LA16_260=='h') ) { - int LA16_293 = input.LA(8); - - if ( ((LA16_293>='0' && LA16_293<='9')||(LA16_293>='A' && LA16_293<='Z')||LA16_293=='_'||(LA16_293>='a' && LA16_293<='z')||(LA16_293>='\u00C0' && LA16_293<='\u00D6')||(LA16_293>='\u00D8' && LA16_293<='\u00F6')||(LA16_293>='\u00F8' && LA16_293<='\u00FF')) ) { - alt16=61; - } - else { - alt16=24;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case 'A': - case 'B': - case 'C': - case 'D': - case 'E': - case 'F': - case 'G': - case 'H': - case 'I': - case 'J': - case 'K': - case 'L': - case 'M': - case 'N': - case 'O': - case 'P': - case 'Q': - case 'R': - case 'S': - case 'T': - case 'U': - case 'V': - case 'W': - case 'X': - case 'Y': - case 'Z': - case '_': - case 'a': - case 'b': - case 'c': - case 'd': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': - case '\u00C0': - case '\u00C1': - case '\u00C2': - case '\u00C3': - case '\u00C4': - case '\u00C5': - case '\u00C6': - case '\u00C7': - case '\u00C8': - case '\u00C9': - case '\u00CA': - case '\u00CB': - case '\u00CC': - case '\u00CD': - case '\u00CE': - case '\u00CF': - case '\u00D0': - case '\u00D1': - case '\u00D2': - case '\u00D3': - case '\u00D4': - case '\u00D5': - case '\u00D6': - case '\u00D8': - case '\u00D9': - case '\u00DA': - case '\u00DB': - case '\u00DC': - case '\u00DD': - case '\u00DE': - case '\u00DF': - case '\u00E0': - case '\u00E1': - case '\u00E2': - case '\u00E3': - case '\u00E4': - case '\u00E5': - case '\u00E6': - case '\u00E7': - case '\u00E8': - case '\u00E9': - case '\u00EA': - case '\u00EB': - case '\u00EC': - case '\u00ED': - case '\u00EE': - case '\u00EF': - case '\u00F0': - case '\u00F1': - case '\u00F2': - case '\u00F3': - case '\u00F4': - case '\u00F5': - case '\u00F6': - case '\u00F8': - case '\u00F9': - case '\u00FA': - case '\u00FB': - case '\u00FC': - case '\u00FD': - case '\u00FE': - case '\u00FF': - { - alt16=61; - } - break; - default: - alt16=29;} - - } - else { - alt16=61;} - } - break; - case 'a': - { - int LA16_61 = input.LA(3); - - if ( (LA16_61=='l') ) { - int LA16_118 = input.LA(4); - - if ( (LA16_118=='s') ) { - int LA16_172 = input.LA(5); - - if ( (LA16_172=='e') ) { - int LA16_222 = input.LA(6); - - if ( ((LA16_222>='0' && LA16_222<='9')||(LA16_222>='A' && LA16_222<='Z')||LA16_222=='_'||(LA16_222>='a' && LA16_222<='z')||(LA16_222>='\u00C0' && LA16_222<='\u00D6')||(LA16_222>='\u00D8' && LA16_222<='\u00F6')||(LA16_222>='\u00F8' && LA16_222<='\u00FF')) ) { - alt16=61; - } - else { - alt16=33;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'l': - { - switch ( input.LA(2) ) { - case 'i': - { - int LA16_62 = input.LA(3); - - if ( (LA16_62=='b') ) { - int LA16_119 = input.LA(4); - - if ( (LA16_119=='r') ) { - int LA16_173 = input.LA(5); - - if ( (LA16_173=='a') ) { - int LA16_223 = input.LA(6); - - if ( (LA16_223=='r') ) { - int LA16_262 = input.LA(7); - - if ( (LA16_262=='y') ) { - int LA16_294 = input.LA(8); - - if ( ((LA16_294>='0' && LA16_294<='9')||(LA16_294>='A' && LA16_294<='Z')||LA16_294=='_'||(LA16_294>='a' && LA16_294<='z')||(LA16_294>='\u00C0' && LA16_294<='\u00D6')||(LA16_294>='\u00D8' && LA16_294<='\u00F6')||(LA16_294>='\u00F8' && LA16_294<='\u00FF')) ) { - alt16=61; - } - else { - alt16=5;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'a': - { - int LA16_63 = input.LA(3); - - if ( (LA16_63=='z') ) { - int LA16_120 = input.LA(4); - - if ( (LA16_120=='y') ) { - int LA16_174 = input.LA(5); - - if ( ((LA16_174>='0' && LA16_174<='9')||(LA16_174>='A' && LA16_174<='Z')||LA16_174=='_'||(LA16_174>='a' && LA16_174<='z')||(LA16_174>='\u00C0' && LA16_174<='\u00D6')||(LA16_174>='\u00D8' && LA16_174<='\u00F6')||(LA16_174>='\u00F8' && LA16_174<='\u00FF')) ) { - alt16=61; - } - else { - alt16=17;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'e': - { - int LA16_64 = input.LA(3); - - if ( (LA16_64=='t') ) { - int LA16_121 = input.LA(4); - - if ( ((LA16_121>='0' && LA16_121<='9')||(LA16_121>='A' && LA16_121<='Z')||LA16_121=='_'||(LA16_121>='a' && LA16_121<='z')||(LA16_121>='\u00C0' && LA16_121<='\u00D6')||(LA16_121>='\u00D8' && LA16_121<='\u00F6')||(LA16_121>='\u00F8' && LA16_121<='\u00FF')) ) { - alt16=61; - } - else { - alt16=37;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'q': - { - int LA16_6 = input.LA(2); - - if ( (LA16_6=='u') ) { - int LA16_65 = input.LA(3); - - if ( (LA16_65=='e') ) { - int LA16_122 = input.LA(4); - - if ( (LA16_122=='r') ) { - int LA16_176 = input.LA(5); - - if ( (LA16_176=='y') ) { - int LA16_225 = input.LA(6); - - if ( ((LA16_225>='0' && LA16_225<='9')||(LA16_225>='A' && LA16_225<='Z')||LA16_225=='_'||(LA16_225>='a' && LA16_225<='z')||(LA16_225>='\u00C0' && LA16_225<='\u00D6')||(LA16_225>='\u00D8' && LA16_225<='\u00F6')||(LA16_225>='\u00F8' && LA16_225<='\u00FF')) ) { - alt16=61; - } - else { - alt16=6;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'u': - { - switch ( input.LA(2) ) { - case 's': - { - switch ( input.LA(3) ) { - case 'i': - { - int LA16_123 = input.LA(4); - - if ( (LA16_123=='n') ) { - int LA16_177 = input.LA(5); - - if ( (LA16_177=='g') ) { - int LA16_226 = input.LA(6); - - if ( ((LA16_226>='0' && LA16_226<='9')||(LA16_226>='A' && LA16_226<='Z')||LA16_226=='_'||(LA16_226>='a' && LA16_226<='z')||(LA16_226>='\u00C0' && LA16_226<='\u00D6')||(LA16_226>='\u00D8' && LA16_226<='\u00F6')||(LA16_226>='\u00F8' && LA16_226<='\u00FF')) ) { - alt16=61; - } - else { - alt16=15;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'e': - { - int LA16_124 = input.LA(4); - - if ( (LA16_124=='s') ) { - int LA16_178 = input.LA(5); - - if ( ((LA16_178>='0' && LA16_178<='9')||(LA16_178>='A' && LA16_178<='Z')||LA16_178=='_'||(LA16_178>='a' && LA16_178<='z')||(LA16_178>='\u00C0' && LA16_178<='\u00D6')||(LA16_178>='\u00D8' && LA16_178<='\u00F6')||(LA16_178>='\u00F8' && LA16_178<='\u00FF')) ) { - alt16=61; - } - else { - alt16=7;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'n': - { - int LA16_67 = input.LA(3); - - if ( (LA16_67=='i') ) { - int LA16_125 = input.LA(4); - - if ( (LA16_125=='q') ) { - int LA16_179 = input.LA(5); - - if ( (LA16_179=='u') ) { - int LA16_228 = input.LA(6); - - if ( (LA16_228=='e') ) { - int LA16_265 = input.LA(7); - - if ( ((LA16_265>='0' && LA16_265<='9')||(LA16_265>='A' && LA16_265<='Z')||LA16_265=='_'||(LA16_265>='a' && LA16_265<='z')||(LA16_265>='\u00C0' && LA16_265<='\u00D6')||(LA16_265>='\u00D8' && LA16_265<='\u00F6')||(LA16_265>='\u00F8' && LA16_265<='\u00FF')) ) { - alt16=61; - } - else { - alt16=16;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'h': - { - int LA16_8 = input.LA(2); - - if ( (LA16_8=='e') ) { - int LA16_68 = input.LA(3); - - if ( (LA16_68=='l') ) { - int LA16_126 = input.LA(4); - - if ( (LA16_126=='p') ) { - int LA16_180 = input.LA(5); - - if ( (LA16_180=='e') ) { - int LA16_229 = input.LA(6); - - if ( (LA16_229=='r') ) { - int LA16_266 = input.LA(7); - - if ( ((LA16_266>='0' && LA16_266<='9')||(LA16_266>='A' && LA16_266<='Z')||LA16_266=='_'||(LA16_266>='a' && LA16_266<='z')||(LA16_266>='\u00C0' && LA16_266<='\u00D6')||(LA16_266>='\u00D8' && LA16_266<='\u00F6')||(LA16_266>='\u00F8' && LA16_266<='\u00FF')) ) { - alt16=61; - } - else { - alt16=8;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'd': - { - switch ( input.LA(2) ) { - case 'e': - { - int LA16_69 = input.LA(3); - - if ( (LA16_69=='f') ) { - int LA16_127 = input.LA(4); - - if ( ((LA16_127>='0' && LA16_127<='9')||(LA16_127>='A' && LA16_127<='Z')||LA16_127=='_'||(LA16_127>='a' && LA16_127<='z')||(LA16_127>='\u00C0' && LA16_127<='\u00D6')||(LA16_127>='\u00D8' && LA16_127<='\u00F6')||(LA16_127>='\u00F8' && LA16_127<='\u00FF')) ) { - alt16=61; - } - else { - alt16=9;} - } - else { - alt16=61;} - } - break; - case 'o': - { - int LA16_70 = input.LA(3); - - if ( ((LA16_70>='0' && LA16_70<='9')||(LA16_70>='A' && LA16_70<='Z')||LA16_70=='_'||(LA16_70>='a' && LA16_70<='z')||(LA16_70>='\u00C0' && LA16_70<='\u00D6')||(LA16_70>='\u00D8' && LA16_70<='\u00F6')||(LA16_70>='\u00F8' && LA16_70<='\u00FF')) ) { - alt16=61; - } - else { - alt16=26;} - } - break; - case 'r': - { - int LA16_71 = input.LA(3); - - if ( (LA16_71=='o') ) { - int LA16_129 = input.LA(4); - - if ( (LA16_129=='p') ) { - int LA16_182 = input.LA(5); - - if ( ((LA16_182>='0' && LA16_182<='9')||(LA16_182>='A' && LA16_182<='Z')||LA16_182=='_'||(LA16_182>='a' && LA16_182<='z')||(LA16_182>='\u00C0' && LA16_182<='\u00D6')||(LA16_182>='\u00D8' && LA16_182<='\u00F6')||(LA16_182>='\u00F8' && LA16_182<='\u00FF')) ) { - alt16=61; - } - else { - alt16=25;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'i': - { - switch ( input.LA(3) ) { - case 's': - { - int LA16_130 = input.LA(4); - - if ( (LA16_130=='t') ) { - int LA16_183 = input.LA(5); - - if ( (LA16_183=='i') ) { - int LA16_231 = input.LA(6); - - if ( (LA16_231=='n') ) { - int LA16_267 = input.LA(7); - - if ( (LA16_267=='c') ) { - int LA16_297 = input.LA(8); - - if ( (LA16_297=='t') ) { - int LA16_319 = input.LA(9); - - if ( ((LA16_319>='0' && LA16_319<='9')||(LA16_319>='A' && LA16_319<='Z')||LA16_319=='_'||(LA16_319>='a' && LA16_319<='z')||(LA16_319>='\u00C0' && LA16_319<='\u00D6')||(LA16_319>='\u00D8' && LA16_319<='\u00F6')||(LA16_319>='\u00F8' && LA16_319<='\u00FF')) ) { - alt16=61; - } - else { - alt16=23;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'v': - { - int LA16_131 = input.LA(4); - - if ( ((LA16_131>='0' && LA16_131<='9')||(LA16_131>='A' && LA16_131<='Z')||LA16_131=='_'||(LA16_131>='a' && LA16_131<='z')||(LA16_131>='\u00C0' && LA16_131<='\u00D6')||(LA16_131>='\u00D8' && LA16_131<='\u00F6')||(LA16_131>='\u00F8' && LA16_131<='\u00FF')) ) { - alt16=61; - } - else { - alt16=53;} - } - break; - default: - alt16=61;} - - } - break; - default: - alt16=61;} - - } - break; - case 'n': - { - int LA16_10 = input.LA(2); - - if ( (LA16_10=='o') ) { - switch ( input.LA(3) ) { - case 't': - { - int LA16_132 = input.LA(4); - - if ( ((LA16_132>='0' && LA16_132<='9')||(LA16_132>='A' && LA16_132<='Z')||LA16_132=='_'||(LA16_132>='a' && LA16_132<='z')||(LA16_132>='\u00C0' && LA16_132<='\u00D6')||(LA16_132>='\u00D8' && LA16_132<='\u00F6')||(LA16_132>='\u00F8' && LA16_132<='\u00FF')) ) { - alt16=61; - } - else { - alt16=52;} - } - break; - case 'd': - { - int LA16_133 = input.LA(4); - - if ( (LA16_133=='e') ) { - int LA16_186 = input.LA(5); - - if ( (LA16_186=='f') ) { - int LA16_232 = input.LA(6); - - if ( (LA16_232=='a') ) { - int LA16_268 = input.LA(7); - - if ( (LA16_268=='u') ) { - int LA16_298 = input.LA(8); - - if ( (LA16_298=='l') ) { - int LA16_320 = input.LA(9); - - if ( (LA16_320=='t') ) { - int LA16_337 = input.LA(10); - - if ( ((LA16_337>='0' && LA16_337<='9')||(LA16_337>='A' && LA16_337<='Z')||LA16_337=='_'||(LA16_337>='a' && LA16_337<='z')||(LA16_337>='\u00C0' && LA16_337<='\u00D6')||(LA16_337>='\u00D8' && LA16_337<='\u00F6')||(LA16_337>='\u00F8' && LA16_337<='\u00FF')) ) { - alt16=61; - } - else { - alt16=11;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - else { - alt16=61;} - } - break; - case 'a': - { - switch ( input.LA(2) ) { - case 'b': - { - int LA16_74 = input.LA(3); - - if ( (LA16_74=='s') ) { - int LA16_134 = input.LA(4); - - if ( (LA16_134=='t') ) { - int LA16_187 = input.LA(5); - - if ( (LA16_187=='r') ) { - int LA16_233 = input.LA(6); - - if ( (LA16_233=='a') ) { - int LA16_269 = input.LA(7); - - if ( (LA16_269=='c') ) { - int LA16_299 = input.LA(8); - - if ( (LA16_299=='t') ) { - int LA16_321 = input.LA(9); - - if ( ((LA16_321>='0' && LA16_321<='9')||(LA16_321>='A' && LA16_321<='Z')||LA16_321=='_'||(LA16_321>='a' && LA16_321<='z')||(LA16_321>='\u00C0' && LA16_321<='\u00D6')||(LA16_321>='\u00D8' && LA16_321<='\u00F6')||(LA16_321>='\u00F8' && LA16_321<='\u00FF')) ) { - alt16=61; - } - else { - alt16=12;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'n': - { - int LA16_75 = input.LA(3); - - if ( (LA16_75=='d') ) { - int LA16_135 = input.LA(4); - - if ( ((LA16_135>='0' && LA16_135<='9')||(LA16_135>='A' && LA16_135<='Z')||LA16_135=='_'||(LA16_135>='a' && LA16_135<='z')||(LA16_135>='\u00C0' && LA16_135<='\u00D6')||(LA16_135>='\u00D8' && LA16_135<='\u00F6')||(LA16_135>='\u00F8' && LA16_135<='\u00FF')) ) { - alt16=61; - } - else { - alt16=55;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'e': - { - switch ( input.LA(2) ) { - case 'x': - { - int LA16_76 = input.LA(3); - - if ( (LA16_76=='t') ) { - int LA16_136 = input.LA(4); - - if ( (LA16_136=='e') ) { - int LA16_189 = input.LA(5); - - if ( (LA16_189=='n') ) { - int LA16_234 = input.LA(6); - - if ( (LA16_234=='d') ) { - int LA16_270 = input.LA(7); - - if ( (LA16_270=='s') ) { - int LA16_300 = input.LA(8); - - if ( ((LA16_300>='0' && LA16_300<='9')||(LA16_300>='A' && LA16_300<='Z')||LA16_300=='_'||(LA16_300>='a' && LA16_300<='z')||(LA16_300>='\u00C0' && LA16_300<='\u00D6')||(LA16_300>='\u00D8' && LA16_300<='\u00F6')||(LA16_300>='\u00F8' && LA16_300<='\u00FF')) ) { - alt16=61; - } - else { - alt16=14;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'n': - { - switch ( input.LA(3) ) { - case 'd': - { - switch ( input.LA(4) ) { - case 'p': - { - int LA16_190 = input.LA(5); - - if ( (LA16_190=='o') ) { - int LA16_235 = input.LA(6); - - if ( (LA16_235=='i') ) { - int LA16_271 = input.LA(7); - - if ( (LA16_271=='n') ) { - int LA16_301 = input.LA(8); - - if ( (LA16_301=='t') ) { - int LA16_323 = input.LA(9); - - if ( ((LA16_323>='0' && LA16_323<='9')||(LA16_323>='A' && LA16_323<='Z')||LA16_323=='_'||(LA16_323>='a' && LA16_323<='z')||(LA16_323>='\u00C0' && LA16_323<='\u00D6')||(LA16_323>='\u00D8' && LA16_323<='\u00F6')||(LA16_323>='\u00F8' && LA16_323<='\u00FF')) ) { - alt16=61; - } - else { - alt16=19;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'i': - { - int LA16_191 = input.LA(5); - - if ( (LA16_191=='f') ) { - int LA16_236 = input.LA(6); - - if ( ((LA16_236>='0' && LA16_236<='9')||(LA16_236>='A' && LA16_236<='Z')||LA16_236=='_'||(LA16_236>='a' && LA16_236<='z')||(LA16_236>='\u00C0' && LA16_236<='\u00D6')||(LA16_236>='\u00D8' && LA16_236<='\u00F6')||(LA16_236>='\u00F8' && LA16_236<='\u00FF')) ) { - alt16=61; - } - else { - alt16=35;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 't': - { - int LA16_138 = input.LA(4); - - if ( (LA16_138=='r') ) { - int LA16_192 = input.LA(5); - - if ( (LA16_192=='y') ) { - int LA16_237 = input.LA(6); - - if ( (LA16_237=='p') ) { - int LA16_273 = input.LA(7); - - if ( (LA16_273=='o') ) { - int LA16_302 = input.LA(8); - - if ( (LA16_302=='i') ) { - int LA16_324 = input.LA(9); - - if ( (LA16_324=='n') ) { - int LA16_340 = input.LA(10); - - if ( (LA16_340=='t') ) { - int LA16_347 = input.LA(11); - - if ( ((LA16_347>='0' && LA16_347<='9')||(LA16_347>='A' && LA16_347<='Z')||LA16_347=='_'||(LA16_347>='a' && LA16_347<='z')||(LA16_347>='\u00C0' && LA16_347<='\u00D6')||(LA16_347>='\u00D8' && LA16_347<='\u00F6')||(LA16_347>='\u00F8' && LA16_347<='\u00FF')) ) { - alt16=61; - } - else { - alt16=18;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'l': - { - int LA16_78 = input.LA(3); - - if ( (LA16_78=='s') ) { - int LA16_139 = input.LA(4); - - if ( (LA16_139=='e') ) { - int LA16_193 = input.LA(5); - - if ( ((LA16_193>='0' && LA16_193<='9')||(LA16_193>='A' && LA16_193<='Z')||LA16_193=='_'||(LA16_193>='a' && LA16_193<='z')||(LA16_193>='\u00C0' && LA16_193<='\u00D6')||(LA16_193>='\u00D8' && LA16_193<='\u00F6')||(LA16_193>='\u00F8' && LA16_193<='\u00FF')) ) { - alt16=61; - } - else { - alt16=28;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'i': - { - switch ( input.LA(2) ) { - case 'f': - { - int LA16_79 = input.LA(3); - - if ( ((LA16_79>='0' && LA16_79<='9')||(LA16_79>='A' && LA16_79<='Z')||LA16_79=='_'||(LA16_79>='a' && LA16_79<='z')||(LA16_79>='\u00C0' && LA16_79<='\u00D6')||(LA16_79>='\u00D8' && LA16_79<='\u00F6')||(LA16_79>='\u00F8' && LA16_79<='\u00FF')) ) { - alt16=61; - } - else { - alt16=27;} - } - break; - case 't': - { - int LA16_80 = input.LA(3); - - if ( (LA16_80=='e') ) { - int LA16_141 = input.LA(4); - - if ( (LA16_141=='r') ) { - int LA16_194 = input.LA(5); - - if ( (LA16_194=='a') ) { - int LA16_239 = input.LA(6); - - if ( (LA16_239=='t') ) { - int LA16_274 = input.LA(7); - - if ( (LA16_274=='e') ) { - int LA16_303 = input.LA(8); - - if ( ((LA16_303>='0' && LA16_303<='9')||(LA16_303>='A' && LA16_303<='Z')||LA16_303=='_'||(LA16_303>='a' && LA16_303<='z')||(LA16_303>='\u00C0' && LA16_303<='\u00D6')||(LA16_303>='\u00D8' && LA16_303<='\u00F6')||(LA16_303>='\u00F8' && LA16_303<='\u00FF')) ) { - alt16=61; - } - else { - alt16=30;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'n': - { - int LA16_81 = input.LA(3); - - if ( ((LA16_81>='0' && LA16_81<='9')||(LA16_81>='A' && LA16_81<='Z')||LA16_81=='_'||(LA16_81>='a' && LA16_81<='z')||(LA16_81>='\u00C0' && LA16_81<='\u00D6')||(LA16_81>='\u00D8' && LA16_81<='\u00F6')||(LA16_81>='\u00F8' && LA16_81<='\u00FF')) ) { - alt16=61; - } - else { - alt16=20;} - } - break; - case 'm': - { - int LA16_82 = input.LA(3); - - if ( (LA16_82=='p') ) { - int LA16_143 = input.LA(4); - - if ( (LA16_143=='l') ) { - int LA16_195 = input.LA(5); - - if ( (LA16_195=='i') ) { - int LA16_240 = input.LA(6); - - if ( (LA16_240=='e') ) { - int LA16_275 = input.LA(7); - - if ( (LA16_275=='s') ) { - int LA16_304 = input.LA(8); - - if ( ((LA16_304>='0' && LA16_304<='9')||(LA16_304>='A' && LA16_304<='Z')||LA16_304=='_'||(LA16_304>='a' && LA16_304<='z')||(LA16_304>='\u00C0' && LA16_304<='\u00D6')||(LA16_304>='\u00D8' && LA16_304<='\u00F6')||(LA16_304>='\u00F8' && LA16_304<='\u00FF')) ) { - alt16=61; - } - else { - alt16=58;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 't': - { - switch ( input.LA(2) ) { - case 'o': - { - int LA16_83 = input.LA(3); - - if ( ((LA16_83>='0' && LA16_83<='9')||(LA16_83>='A' && LA16_83<='Z')||LA16_83=='_'||(LA16_83>='a' && LA16_83<='z')||(LA16_83>='\u00C0' && LA16_83<='\u00D6')||(LA16_83>='\u00D8' && LA16_83<='\u00F6')||(LA16_83>='\u00F8' && LA16_83<='\u00FF')) ) { - alt16=61; - } - else { - alt16=21;} - } - break; - case 'r': - { - int LA16_84 = input.LA(3); - - if ( (LA16_84=='u') ) { - int LA16_145 = input.LA(4); - - if ( (LA16_145=='e') ) { - int LA16_196 = input.LA(5); - - if ( ((LA16_196>='0' && LA16_196<='9')||(LA16_196>='A' && LA16_196<='Z')||LA16_196=='_'||(LA16_196>='a' && LA16_196<='z')||(LA16_196>='\u00C0' && LA16_196<='\u00D6')||(LA16_196>='\u00D8' && LA16_196<='\u00F6')||(LA16_196>='\u00F8' && LA16_196<='\u00FF')) ) { - alt16=61; - } - else { - alt16=32;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'h': - { - int LA16_85 = input.LA(3); - - if ( (LA16_85=='e') ) { - int LA16_146 = input.LA(4); - - if ( (LA16_146=='n') ) { - int LA16_197 = input.LA(5); - - if ( ((LA16_197>='0' && LA16_197<='9')||(LA16_197>='A' && LA16_197<='Z')||LA16_197=='_'||(LA16_197>='a' && LA16_197<='z')||(LA16_197>='\u00C0' && LA16_197<='\u00D6')||(LA16_197>='\u00D8' && LA16_197<='\u00F6')||(LA16_197>='\u00F8' && LA16_197<='\u00FF')) ) { - alt16=61; - } - else { - alt16=34;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'O': - { - switch ( input.LA(2) ) { - case 'r': - { - int LA16_86 = input.LA(3); - - if ( (LA16_86=='d') ) { - int LA16_147 = input.LA(4); - - if ( (LA16_147=='e') ) { - int LA16_198 = input.LA(5); - - if ( (LA16_198=='r') ) { - int LA16_243 = input.LA(6); - - if ( (LA16_243=='e') ) { - int LA16_276 = input.LA(7); - - if ( (LA16_276=='d') ) { - int LA16_305 = input.LA(8); - - if ( (LA16_305=='S') ) { - int LA16_327 = input.LA(9); - - if ( (LA16_327=='e') ) { - int LA16_341 = input.LA(10); - - if ( (LA16_341=='t') ) { - int LA16_348 = input.LA(11); - - if ( ((LA16_348>='0' && LA16_348<='9')||(LA16_348>='A' && LA16_348<='Z')||LA16_348=='_'||(LA16_348>='a' && LA16_348<='z')||(LA16_348>='\u00C0' && LA16_348<='\u00D6')||(LA16_348>='\u00D8' && LA16_348<='\u00F6')||(LA16_348>='\u00F8' && LA16_348<='\u00FF')) ) { - alt16=61; - } - else { - alt16=40;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'c': - { - int LA16_87 = input.LA(3); - - if ( (LA16_87=='l') ) { - switch ( input.LA(4) ) { - case 'T': - { - int LA16_199 = input.LA(5); - - if ( (LA16_199=='y') ) { - int LA16_244 = input.LA(6); - - if ( (LA16_244=='p') ) { - int LA16_277 = input.LA(7); - - if ( (LA16_277=='e') ) { - int LA16_306 = input.LA(8); - - if ( ((LA16_306>='0' && LA16_306<='9')||(LA16_306>='A' && LA16_306<='Z')||LA16_306=='_'||(LA16_306>='a' && LA16_306<='z')||(LA16_306>='\u00C0' && LA16_306<='\u00D6')||(LA16_306>='\u00D8' && LA16_306<='\u00F6')||(LA16_306>='\u00F8' && LA16_306<='\u00FF')) ) { - alt16=61; - } - else { - alt16=44;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'U': - { - int LA16_200 = input.LA(5); - - if ( (LA16_200=='n') ) { - int LA16_245 = input.LA(6); - - if ( (LA16_245=='d') ) { - int LA16_278 = input.LA(7); - - if ( (LA16_278=='e') ) { - int LA16_307 = input.LA(8); - - if ( (LA16_307=='f') ) { - int LA16_329 = input.LA(9); - - if ( (LA16_329=='i') ) { - int LA16_342 = input.LA(10); - - if ( (LA16_342=='n') ) { - int LA16_349 = input.LA(11); - - if ( (LA16_349=='e') ) { - int LA16_354 = input.LA(12); - - if ( (LA16_354=='d') ) { - int LA16_356 = input.LA(13); - - if ( ((LA16_356>='0' && LA16_356<='9')||(LA16_356>='A' && LA16_356<='Z')||LA16_356=='_'||(LA16_356>='a' && LA16_356<='z')||(LA16_356>='\u00C0' && LA16_356<='\u00D6')||(LA16_356>='\u00D8' && LA16_356<='\u00F6')||(LA16_356>='\u00F8' && LA16_356<='\u00FF')) ) { - alt16=61; - } - else { - alt16=31;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'A': - { - int LA16_201 = input.LA(5); - - if ( (LA16_201=='n') ) { - int LA16_246 = input.LA(6); - - if ( (LA16_246=='y') ) { - int LA16_279 = input.LA(7); - - if ( ((LA16_279>='0' && LA16_279<='9')||(LA16_279>='A' && LA16_279<='Z')||LA16_279=='_'||(LA16_279>='a' && LA16_279<='z')||(LA16_279>='\u00C0' && LA16_279<='\u00D6')||(LA16_279>='\u00D8' && LA16_279<='\u00F6')||(LA16_279>='\u00F8' && LA16_279<='\u00FF')) ) { - alt16=61; - } - else { - alt16=45;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 's': - { - int LA16_16 = input.LA(2); - - if ( (LA16_16=='u') ) { - int LA16_88 = input.LA(3); - - if ( (LA16_88=='p') ) { - int LA16_149 = input.LA(4); - - if ( (LA16_149=='e') ) { - int LA16_202 = input.LA(5); - - if ( (LA16_202=='r') ) { - int LA16_247 = input.LA(6); - - if ( ((LA16_247>='0' && LA16_247<='9')||(LA16_247>='A' && LA16_247<='Z')||LA16_247=='_'||(LA16_247>='a' && LA16_247<='z')||(LA16_247>='\u00C0' && LA16_247<='\u00D6')||(LA16_247>='\u00D8' && LA16_247<='\u00F6')||(LA16_247>='\u00F8' && LA16_247<='\u00FF')) ) { - alt16=61; - } - else { - alt16=36;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'B': - { - switch ( input.LA(2) ) { - case 'a': - { - int LA16_89 = input.LA(3); - - if ( (LA16_89=='g') ) { - int LA16_150 = input.LA(4); - - if ( ((LA16_150>='0' && LA16_150<='9')||(LA16_150>='A' && LA16_150<='Z')||LA16_150=='_'||(LA16_150>='a' && LA16_150<='z')||(LA16_150>='\u00C0' && LA16_150<='\u00D6')||(LA16_150>='\u00D8' && LA16_150<='\u00F6')||(LA16_150>='\u00F8' && LA16_150<='\u00FF')) ) { - alt16=61; - } - else { - alt16=38;} - } - else { - alt16=61;} - } - break; - case 'o': - { - int LA16_90 = input.LA(3); - - if ( (LA16_90=='o') ) { - int LA16_151 = input.LA(4); - - if ( (LA16_151=='l') ) { - int LA16_204 = input.LA(5); - - if ( (LA16_204=='e') ) { - int LA16_248 = input.LA(6); - - if ( (LA16_248=='a') ) { - int LA16_281 = input.LA(7); - - if ( (LA16_281=='n') ) { - int LA16_309 = input.LA(8); - - if ( ((LA16_309>='0' && LA16_309<='9')||(LA16_309>='A' && LA16_309<='Z')||LA16_309=='_'||(LA16_309>='a' && LA16_309<='z')||(LA16_309>='\u00C0' && LA16_309<='\u00D6')||(LA16_309>='\u00D8' && LA16_309<='\u00F6')||(LA16_309>='\u00F8' && LA16_309<='\u00FF')) ) { - alt16=61; - } - else { - alt16=49;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'S': - { - switch ( input.LA(2) ) { - case 'e': - { - switch ( input.LA(3) ) { - case 't': - { - int LA16_152 = input.LA(4); - - if ( ((LA16_152>='0' && LA16_152<='9')||(LA16_152>='A' && LA16_152<='Z')||LA16_152=='_'||(LA16_152>='a' && LA16_152<='z')||(LA16_152>='\u00C0' && LA16_152<='\u00D6')||(LA16_152>='\u00D8' && LA16_152<='\u00F6')||(LA16_152>='\u00F8' && LA16_152<='\u00FF')) ) { - alt16=61; - } - else { - alt16=39;} - } - break; - case 'q': - { - int LA16_153 = input.LA(4); - - if ( (LA16_153=='u') ) { - int LA16_206 = input.LA(5); - - if ( (LA16_206=='e') ) { - int LA16_249 = input.LA(6); - - if ( (LA16_249=='n') ) { - int LA16_282 = input.LA(7); - - if ( (LA16_282=='c') ) { - int LA16_310 = input.LA(8); - - if ( (LA16_310=='e') ) { - int LA16_331 = input.LA(9); - - if ( ((LA16_331>='0' && LA16_331<='9')||(LA16_331>='A' && LA16_331<='Z')||LA16_331=='_'||(LA16_331>='a' && LA16_331<='z')||(LA16_331>='\u00C0' && LA16_331<='\u00D6')||(LA16_331>='\u00D8' && LA16_331<='\u00F6')||(LA16_331>='\u00F8' && LA16_331<='\u00FF')) ) { - alt16=61; - } - else { - alt16=41;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 't': - { - int LA16_92 = input.LA(3); - - if ( (LA16_92=='r') ) { - int LA16_154 = input.LA(4); - - if ( (LA16_154=='i') ) { - int LA16_207 = input.LA(5); - - if ( (LA16_207=='n') ) { - int LA16_250 = input.LA(6); - - if ( (LA16_250=='g') ) { - int LA16_283 = input.LA(7); - - if ( ((LA16_283>='0' && LA16_283<='9')||(LA16_283>='A' && LA16_283<='Z')||LA16_283=='_'||(LA16_283>='a' && LA16_283<='z')||(LA16_283>='\u00C0' && LA16_283<='\u00D6')||(LA16_283>='\u00D8' && LA16_283<='\u00F6')||(LA16_283>='\u00F8' && LA16_283<='\u00FF')) ) { - alt16=61; - } - else { - alt16=50;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - default: - alt16=61;} - - } - break; - case 'M': - { - int LA16_19 = input.LA(2); - - if ( (LA16_19=='a') ) { - int LA16_93 = input.LA(3); - - if ( (LA16_93=='p') ) { - int LA16_155 = input.LA(4); - - if ( ((LA16_155>='0' && LA16_155<='9')||(LA16_155>='A' && LA16_155<='Z')||LA16_155=='_'||(LA16_155>='a' && LA16_155<='z')||(LA16_155>='\u00C0' && LA16_155<='\u00D6')||(LA16_155>='\u00D8' && LA16_155<='\u00F6')||(LA16_155>='\u00F8' && LA16_155<='\u00FF')) ) { - alt16=61; - } - else { - alt16=42;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'T': - { - int LA16_20 = input.LA(2); - - if ( (LA16_20=='u') ) { - int LA16_94 = input.LA(3); - - if ( (LA16_94=='p') ) { - int LA16_156 = input.LA(4); - - if ( (LA16_156=='l') ) { - int LA16_209 = input.LA(5); - - if ( (LA16_209=='e') ) { - switch ( input.LA(6) ) { - case 'T': - { - int LA16_284 = input.LA(7); - - if ( (LA16_284=='y') ) { - int LA16_312 = input.LA(8); - - if ( (LA16_312=='p') ) { - int LA16_332 = input.LA(9); - - if ( (LA16_332=='e') ) { - int LA16_344 = input.LA(10); - - if ( ((LA16_344>='0' && LA16_344<='9')||(LA16_344>='A' && LA16_344<='Z')||LA16_344=='_'||(LA16_344>='a' && LA16_344<='z')||(LA16_344>='\u00C0' && LA16_344<='\u00D6')||(LA16_344>='\u00D8' && LA16_344<='\u00F6')||(LA16_344>='\u00F8' && LA16_344<='\u00FF')) ) { - alt16=61; - } - else { - alt16=46;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case 'A': - case 'B': - case 'C': - case 'D': - case 'E': - case 'F': - case 'G': - case 'H': - case 'I': - case 'J': - case 'K': - case 'L': - case 'M': - case 'N': - case 'O': - case 'P': - case 'Q': - case 'R': - case 'S': - case 'U': - case 'V': - case 'W': - case 'X': - case 'Y': - case 'Z': - case '_': - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': - case '\u00C0': - case '\u00C1': - case '\u00C2': - case '\u00C3': - case '\u00C4': - case '\u00C5': - case '\u00C6': - case '\u00C7': - case '\u00C8': - case '\u00C9': - case '\u00CA': - case '\u00CB': - case '\u00CC': - case '\u00CD': - case '\u00CE': - case '\u00CF': - case '\u00D0': - case '\u00D1': - case '\u00D2': - case '\u00D3': - case '\u00D4': - case '\u00D5': - case '\u00D6': - case '\u00D8': - case '\u00D9': - case '\u00DA': - case '\u00DB': - case '\u00DC': - case '\u00DD': - case '\u00DE': - case '\u00DF': - case '\u00E0': - case '\u00E1': - case '\u00E2': - case '\u00E3': - case '\u00E4': - case '\u00E5': - case '\u00E6': - case '\u00E7': - case '\u00E8': - case '\u00E9': - case '\u00EA': - case '\u00EB': - case '\u00EC': - case '\u00ED': - case '\u00EE': - case '\u00EF': - case '\u00F0': - case '\u00F1': - case '\u00F2': - case '\u00F3': - case '\u00F4': - case '\u00F5': - case '\u00F6': - case '\u00F8': - case '\u00F9': - case '\u00FA': - case '\u00FB': - case '\u00FC': - case '\u00FD': - case '\u00FE': - case '\u00FF': - { - alt16=61; - } - break; - default: - alt16=43;} - - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'I': - { - int LA16_21 = input.LA(2); - - if ( (LA16_21=='n') ) { - int LA16_95 = input.LA(3); - - if ( (LA16_95=='t') ) { - int LA16_157 = input.LA(4); - - if ( (LA16_157=='e') ) { - int LA16_210 = input.LA(5); - - if ( (LA16_210=='g') ) { - int LA16_252 = input.LA(6); - - if ( (LA16_252=='e') ) { - int LA16_286 = input.LA(7); - - if ( (LA16_286=='r') ) { - int LA16_313 = input.LA(8); - - if ( ((LA16_313>='0' && LA16_313<='9')||(LA16_313>='A' && LA16_313<='Z')||LA16_313=='_'||(LA16_313>='a' && LA16_313<='z')||(LA16_313>='\u00C0' && LA16_313<='\u00D6')||(LA16_313>='\u00D8' && LA16_313<='\u00F6')||(LA16_313>='\u00F8' && LA16_313<='\u00FF')) ) { - alt16=61; - } - else { - alt16=47;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'R': - { - int LA16_22 = input.LA(2); - - if ( (LA16_22=='e') ) { - int LA16_96 = input.LA(3); - - if ( (LA16_96=='a') ) { - int LA16_158 = input.LA(4); - - if ( (LA16_158=='l') ) { - int LA16_211 = input.LA(5); - - if ( ((LA16_211>='0' && LA16_211<='9')||(LA16_211>='A' && LA16_211<='Z')||LA16_211=='_'||(LA16_211>='a' && LA16_211<='z')||(LA16_211>='\u00C0' && LA16_211<='\u00D6')||(LA16_211>='\u00D8' && LA16_211<='\u00F6')||(LA16_211>='\u00F8' && LA16_211<='\u00FF')) ) { - alt16=61; - } - else { - alt16=48;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'C': - { - int LA16_23 = input.LA(2); - - if ( (LA16_23=='o') ) { - int LA16_97 = input.LA(3); - - if ( (LA16_97=='l') ) { - int LA16_159 = input.LA(4); - - if ( (LA16_159=='l') ) { - int LA16_212 = input.LA(5); - - if ( (LA16_212=='e') ) { - int LA16_254 = input.LA(6); - - if ( (LA16_254=='c') ) { - int LA16_287 = input.LA(7); - - if ( (LA16_287=='t') ) { - int LA16_314 = input.LA(8); - - if ( (LA16_314=='i') ) { - int LA16_334 = input.LA(9); - - if ( (LA16_334=='o') ) { - int LA16_345 = input.LA(10); - - if ( (LA16_345=='n') ) { - int LA16_351 = input.LA(11); - - if ( ((LA16_351>='0' && LA16_351<='9')||(LA16_351>='A' && LA16_351<='Z')||LA16_351=='_'||(LA16_351>='a' && LA16_351<='z')||(LA16_351>='\u00C0' && LA16_351<='\u00D6')||(LA16_351>='\u00D8' && LA16_351<='\u00F6')||(LA16_351>='\u00F8' && LA16_351<='\u00FF')) ) { - alt16=61; - } - else { - alt16=51;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case 'o': - { - int LA16_24 = input.LA(2); - - if ( (LA16_24=='r') ) { - int LA16_98 = input.LA(3); - - if ( ((LA16_98>='0' && LA16_98<='9')||(LA16_98>='A' && LA16_98<='Z')||LA16_98=='_'||(LA16_98>='a' && LA16_98<='z')||(LA16_98>='\u00C0' && LA16_98<='\u00D6')||(LA16_98>='\u00D8' && LA16_98<='\u00F6')||(LA16_98>='\u00F8' && LA16_98<='\u00FF')) ) { - alt16=61; - } - else { - alt16=56;} - } - else { - alt16=61;} - } - break; - case 'x': - { - int LA16_25 = input.LA(2); - - if ( (LA16_25=='o') ) { - int LA16_99 = input.LA(3); - - if ( (LA16_99=='r') ) { - int LA16_161 = input.LA(4); - - if ( ((LA16_161>='0' && LA16_161<='9')||(LA16_161>='A' && LA16_161<='Z')||LA16_161=='_'||(LA16_161>='a' && LA16_161<='z')||(LA16_161>='\u00C0' && LA16_161<='\u00D6')||(LA16_161>='\u00D8' && LA16_161<='\u00F6')||(LA16_161>='\u00F8' && LA16_161<='\u00FF')) ) { - alt16=61; - } - else { - alt16=57;} - } - else { - alt16=61;} - } - else { - alt16=61;} - } - break; - case '\n': - case '\r': - { - alt16=59; - } - break; - case '\t': - case ' ': - { - alt16=60; - } - break; - case '\"': - case 'A': - case 'D': - case 'E': - case 'F': - case 'G': - case 'H': - case 'J': - case 'K': - case 'L': - case 'N': - case 'P': - case 'Q': - case 'U': - case 'V': - case 'W': - case 'X': - case 'Y': - case 'Z': - case '_': - case 'b': - case 'g': - case 'j': - case 'k': - case 'p': - case 'v': - case 'w': - case 'y': - case 'z': - case '\u00C0': - case '\u00C1': - case '\u00C2': - case '\u00C3': - case '\u00C4': - case '\u00C5': - case '\u00C6': - case '\u00C7': - case '\u00C8': - case '\u00C9': - case '\u00CA': - case '\u00CB': - case '\u00CC': - case '\u00CD': - case '\u00CE': - case '\u00CF': - case '\u00D0': - case '\u00D1': - case '\u00D2': - case '\u00D3': - case '\u00D4': - case '\u00D5': - case '\u00D6': - case '\u00D8': - case '\u00D9': - case '\u00DA': - case '\u00DB': - case '\u00DC': - case '\u00DD': - case '\u00DE': - case '\u00DF': - case '\u00E0': - case '\u00E1': - case '\u00E2': - case '\u00E3': - case '\u00E4': - case '\u00E5': - case '\u00E6': - case '\u00E7': - case '\u00E8': - case '\u00E9': - case '\u00EA': - case '\u00EB': - case '\u00EC': - case '\u00ED': - case '\u00EE': - case '\u00EF': - case '\u00F0': - case '\u00F1': - case '\u00F2': - case '\u00F3': - case '\u00F4': - case '\u00F5': - case '\u00F6': - case '\u00F8': - case '\u00F9': - case '\u00FA': - case '\u00FB': - case '\u00FC': - case '\u00FD': - case '\u00FE': - case '\u00FF': - { - alt16=61; - } - break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - { - alt16=62; - } - break; - case '[': - { - alt16=63; - } - break; - case ']': - { - alt16=64; - } - break; - case '!': - { - alt16=65; - } - break; - case ',': - { - alt16=66; - } - break; - case '(': - { - alt16=67; - } - break; - case ')': - { - alt16=68; - } - break; - case '{': - { - alt16=69; - } - break; - case '}': - { - alt16=70; - } - break; - case ';': - { - alt16=71; - } - break; - case ':': - { - alt16=72; - } - break; - case '|': - { - alt16=73; - } - break; - case '#': - { - alt16=74; - } - break; - case '?': - { - alt16=75; - } - break; - case '@': - { - alt16=76; - } - break; - case '.': - { - alt16=77; - } - break; - case '-': - { - switch ( input.LA(2) ) { - case '-': - { - alt16=91; - } - break; - case '>': - { - alt16=78; - } - break; - default: - alt16=79;} - - } - break; - case '*': - { - alt16=80; - } - break; - case '/': - { - alt16=81; - } - break; - case '+': - { - alt16=82; - } - break; - case '=': - { - alt16=83; - } - break; - case '>': - { - int LA16_50 = input.LA(2); - - if ( (LA16_50=='=') ) { - alt16=86; - } - else { - alt16=84;} - } - break; - case '<': - { - switch ( input.LA(2) ) { - case ':': - { - alt16=90; - } - break; - case '>': - { - alt16=88; - } - break; - case '-': - { - alt16=89; - } - break; - case '=': - { - alt16=87; - } - break; - default: - alt16=85;} - - } - break; - case '\'': - { - alt16=92; - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("1:1: Tokens : ( T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | NL | WS | NAME | INT | LSQUARE | RSQUARE | EXCL | COMA | LPAREN | RPAREN | LCURLY | RCURLY | SEMI | COLON | PIPE | SHARP | QMARK | AROBAS | POINT | RARROW | MINUS | STAR | SLASH | PLUS | EQ | GT | LT | GE | LE | NE | LARROW | ASSIGNARROW | COMMENT | STRING );", 16, 0, input); - - throw nvae; - } - + alt16 = dfa16.predict(input); switch (alt16) { case 1 : - // ATL_ANTLR3.g:1:10: T43 + // ATL_ANTLR3.g:1:10: T__43 { - mT43(); + mT__43(); } break; case 2 : - // ATL_ANTLR3.g:1:14: T44 + // ATL_ANTLR3.g:1:16: T__44 { - mT44(); + mT__44(); } break; case 3 : - // ATL_ANTLR3.g:1:18: T45 + // ATL_ANTLR3.g:1:22: T__45 { - mT45(); + mT__45(); } break; case 4 : - // ATL_ANTLR3.g:1:22: T46 + // ATL_ANTLR3.g:1:28: T__46 { - mT46(); + mT__46(); } break; case 5 : - // ATL_ANTLR3.g:1:26: T47 + // ATL_ANTLR3.g:1:34: T__47 { - mT47(); + mT__47(); } break; case 6 : - // ATL_ANTLR3.g:1:30: T48 + // ATL_ANTLR3.g:1:40: T__48 { - mT48(); + mT__48(); } break; case 7 : - // ATL_ANTLR3.g:1:34: T49 + // ATL_ANTLR3.g:1:46: T__49 { - mT49(); + mT__49(); } break; case 8 : - // ATL_ANTLR3.g:1:38: T50 + // ATL_ANTLR3.g:1:52: T__50 { - mT50(); + mT__50(); } break; case 9 : - // ATL_ANTLR3.g:1:42: T51 + // ATL_ANTLR3.g:1:58: T__51 { - mT51(); + mT__51(); } break; case 10 : - // ATL_ANTLR3.g:1:46: T52 + // ATL_ANTLR3.g:1:64: T__52 { - mT52(); + mT__52(); } break; case 11 : - // ATL_ANTLR3.g:1:50: T53 + // ATL_ANTLR3.g:1:70: T__53 { - mT53(); + mT__53(); } break; case 12 : - // ATL_ANTLR3.g:1:54: T54 + // ATL_ANTLR3.g:1:76: T__54 { - mT54(); + mT__54(); } break; case 13 : - // ATL_ANTLR3.g:1:58: T55 + // ATL_ANTLR3.g:1:82: T__55 { - mT55(); + mT__55(); } break; case 14 : - // ATL_ANTLR3.g:1:62: T56 + // ATL_ANTLR3.g:1:88: T__56 { - mT56(); + mT__56(); } break; case 15 : - // ATL_ANTLR3.g:1:66: T57 + // ATL_ANTLR3.g:1:94: T__57 { - mT57(); + mT__57(); } break; case 16 : - // ATL_ANTLR3.g:1:70: T58 + // ATL_ANTLR3.g:1:100: T__58 { - mT58(); + mT__58(); } break; case 17 : - // ATL_ANTLR3.g:1:74: T59 + // ATL_ANTLR3.g:1:106: T__59 { - mT59(); + mT__59(); } break; case 18 : - // ATL_ANTLR3.g:1:78: T60 + // ATL_ANTLR3.g:1:112: T__60 { - mT60(); + mT__60(); } break; case 19 : - // ATL_ANTLR3.g:1:82: T61 + // ATL_ANTLR3.g:1:118: T__61 { - mT61(); + mT__61(); } break; case 20 : - // ATL_ANTLR3.g:1:86: T62 + // ATL_ANTLR3.g:1:124: T__62 { - mT62(); + mT__62(); } break; case 21 : - // ATL_ANTLR3.g:1:90: T63 + // ATL_ANTLR3.g:1:130: T__63 { - mT63(); + mT__63(); } break; case 22 : - // ATL_ANTLR3.g:1:94: T64 + // ATL_ANTLR3.g:1:136: T__64 { - mT64(); + mT__64(); } break; case 23 : - // ATL_ANTLR3.g:1:98: T65 + // ATL_ANTLR3.g:1:142: T__65 { - mT65(); + mT__65(); } break; case 24 : - // ATL_ANTLR3.g:1:102: T66 + // ATL_ANTLR3.g:1:148: T__66 { - mT66(); + mT__66(); } break; case 25 : - // ATL_ANTLR3.g:1:106: T67 + // ATL_ANTLR3.g:1:154: T__67 { - mT67(); + mT__67(); } break; case 26 : - // ATL_ANTLR3.g:1:110: T68 + // ATL_ANTLR3.g:1:160: T__68 { - mT68(); + mT__68(); } break; case 27 : - // ATL_ANTLR3.g:1:114: T69 + // ATL_ANTLR3.g:1:166: T__69 { - mT69(); + mT__69(); } break; case 28 : - // ATL_ANTLR3.g:1:118: T70 + // ATL_ANTLR3.g:1:172: T__70 { - mT70(); + mT__70(); } break; case 29 : - // ATL_ANTLR3.g:1:122: T71 + // ATL_ANTLR3.g:1:178: T__71 { - mT71(); + mT__71(); } break; case 30 : - // ATL_ANTLR3.g:1:126: T72 + // ATL_ANTLR3.g:1:184: T__72 { - mT72(); + mT__72(); } break; case 31 : - // ATL_ANTLR3.g:1:130: T73 + // ATL_ANTLR3.g:1:190: T__73 { - mT73(); + mT__73(); } break; case 32 : - // ATL_ANTLR3.g:1:134: T74 + // ATL_ANTLR3.g:1:196: T__74 { - mT74(); + mT__74(); } break; case 33 : - // ATL_ANTLR3.g:1:138: T75 + // ATL_ANTLR3.g:1:202: T__75 { - mT75(); + mT__75(); } break; case 34 : - // ATL_ANTLR3.g:1:142: T76 + // ATL_ANTLR3.g:1:208: T__76 { - mT76(); + mT__76(); } break; case 35 : - // ATL_ANTLR3.g:1:146: T77 + // ATL_ANTLR3.g:1:214: T__77 { - mT77(); + mT__77(); } break; case 36 : - // ATL_ANTLR3.g:1:150: T78 + // ATL_ANTLR3.g:1:220: T__78 { - mT78(); + mT__78(); } break; case 37 : - // ATL_ANTLR3.g:1:154: T79 + // ATL_ANTLR3.g:1:226: T__79 { - mT79(); + mT__79(); } break; case 38 : - // ATL_ANTLR3.g:1:158: T80 + // ATL_ANTLR3.g:1:232: T__80 { - mT80(); + mT__80(); } break; case 39 : - // ATL_ANTLR3.g:1:162: T81 + // ATL_ANTLR3.g:1:238: T__81 { - mT81(); + mT__81(); } break; case 40 : - // ATL_ANTLR3.g:1:166: T82 + // ATL_ANTLR3.g:1:244: T__82 { - mT82(); + mT__82(); } break; case 41 : - // ATL_ANTLR3.g:1:170: T83 + // ATL_ANTLR3.g:1:250: T__83 { - mT83(); + mT__83(); } break; case 42 : - // ATL_ANTLR3.g:1:174: T84 + // ATL_ANTLR3.g:1:256: T__84 { - mT84(); + mT__84(); } break; case 43 : - // ATL_ANTLR3.g:1:178: T85 + // ATL_ANTLR3.g:1:262: T__85 { - mT85(); + mT__85(); } break; case 44 : - // ATL_ANTLR3.g:1:182: T86 + // ATL_ANTLR3.g:1:268: T__86 { - mT86(); + mT__86(); } break; case 45 : - // ATL_ANTLR3.g:1:186: T87 + // ATL_ANTLR3.g:1:274: T__87 { - mT87(); + mT__87(); } break; case 46 : - // ATL_ANTLR3.g:1:190: T88 + // ATL_ANTLR3.g:1:280: T__88 { - mT88(); + mT__88(); } break; case 47 : - // ATL_ANTLR3.g:1:194: T89 + // ATL_ANTLR3.g:1:286: T__89 { - mT89(); + mT__89(); } break; case 48 : - // ATL_ANTLR3.g:1:198: T90 + // ATL_ANTLR3.g:1:292: T__90 { - mT90(); + mT__90(); } break; case 49 : - // ATL_ANTLR3.g:1:202: T91 + // ATL_ANTLR3.g:1:298: T__91 { - mT91(); + mT__91(); } break; case 50 : - // ATL_ANTLR3.g:1:206: T92 + // ATL_ANTLR3.g:1:304: T__92 { - mT92(); + mT__92(); } break; case 51 : - // ATL_ANTLR3.g:1:210: T93 + // ATL_ANTLR3.g:1:310: T__93 { - mT93(); + mT__93(); } break; case 52 : - // ATL_ANTLR3.g:1:214: T94 + // ATL_ANTLR3.g:1:316: T__94 { - mT94(); + mT__94(); } break; case 53 : - // ATL_ANTLR3.g:1:218: T95 + // ATL_ANTLR3.g:1:322: T__95 { - mT95(); + mT__95(); } break; case 54 : - // ATL_ANTLR3.g:1:222: T96 + // ATL_ANTLR3.g:1:328: T__96 { - mT96(); + mT__96(); } break; case 55 : - // ATL_ANTLR3.g:1:226: T97 + // ATL_ANTLR3.g:1:334: T__97 { - mT97(); + mT__97(); } break; case 56 : - // ATL_ANTLR3.g:1:230: T98 + // ATL_ANTLR3.g:1:340: T__98 { - mT98(); + mT__98(); } break; case 57 : - // ATL_ANTLR3.g:1:234: T99 + // ATL_ANTLR3.g:1:346: T__99 { - mT99(); + mT__99(); } break; case 58 : - // ATL_ANTLR3.g:1:238: T100 + // ATL_ANTLR3.g:1:352: T__100 { - mT100(); + mT__100(); } break; case 59 : - // ATL_ANTLR3.g:1:243: NL + // ATL_ANTLR3.g:1:359: NL { mNL(); } break; case 60 : - // ATL_ANTLR3.g:1:246: WS + // ATL_ANTLR3.g:1:362: WS { mWS(); } break; case 61 : - // ATL_ANTLR3.g:1:249: NAME + // ATL_ANTLR3.g:1:365: NAME { mNAME(); } break; case 62 : - // ATL_ANTLR3.g:1:254: INT + // ATL_ANTLR3.g:1:370: INT { mINT(); } break; case 63 : - // ATL_ANTLR3.g:1:258: LSQUARE + // ATL_ANTLR3.g:1:374: STRING { - mLSQUARE(); + mSTRING(); } break; case 64 : - // ATL_ANTLR3.g:1:266: RSQUARE + // ATL_ANTLR3.g:1:381: LSQUARE { - mRSQUARE(); + mLSQUARE(); } break; case 65 : - // ATL_ANTLR3.g:1:274: EXCL + // ATL_ANTLR3.g:1:389: RSQUARE { - mEXCL(); + mRSQUARE(); } break; case 66 : - // ATL_ANTLR3.g:1:279: COMA + // ATL_ANTLR3.g:1:397: EXCL { - mCOMA(); + mEXCL(); } break; case 67 : - // ATL_ANTLR3.g:1:284: LPAREN + // ATL_ANTLR3.g:1:402: COMA { - mLPAREN(); + mCOMA(); } break; case 68 : - // ATL_ANTLR3.g:1:291: RPAREN + // ATL_ANTLR3.g:1:407: LPAREN { - mRPAREN(); + mLPAREN(); } break; case 69 : - // ATL_ANTLR3.g:1:298: LCURLY + // ATL_ANTLR3.g:1:414: RPAREN { - mLCURLY(); + mRPAREN(); } break; case 70 : - // ATL_ANTLR3.g:1:305: RCURLY + // ATL_ANTLR3.g:1:421: LCURLY { - mRCURLY(); + mLCURLY(); } break; case 71 : - // ATL_ANTLR3.g:1:312: SEMI + // ATL_ANTLR3.g:1:428: RCURLY { - mSEMI(); + mRCURLY(); } break; case 72 : - // ATL_ANTLR3.g:1:317: COLON + // ATL_ANTLR3.g:1:435: SEMI { - mCOLON(); + mSEMI(); } break; case 73 : - // ATL_ANTLR3.g:1:323: PIPE + // ATL_ANTLR3.g:1:440: COLON { - mPIPE(); + mCOLON(); } break; case 74 : - // ATL_ANTLR3.g:1:328: SHARP + // ATL_ANTLR3.g:1:446: PIPE { - mSHARP(); + mPIPE(); } break; case 75 : - // ATL_ANTLR3.g:1:334: QMARK + // ATL_ANTLR3.g:1:451: SHARP { - mQMARK(); + mSHARP(); } break; case 76 : - // ATL_ANTLR3.g:1:340: AROBAS + // ATL_ANTLR3.g:1:457: QMARK { - mAROBAS(); + mQMARK(); } break; case 77 : - // ATL_ANTLR3.g:1:347: POINT + // ATL_ANTLR3.g:1:463: AROBAS { - mPOINT(); + mAROBAS(); } break; case 78 : - // ATL_ANTLR3.g:1:353: RARROW + // ATL_ANTLR3.g:1:470: POINT { - mRARROW(); + mPOINT(); } break; case 79 : - // ATL_ANTLR3.g:1:360: MINUS + // ATL_ANTLR3.g:1:476: RARROW { - mMINUS(); + mRARROW(); } break; case 80 : - // ATL_ANTLR3.g:1:366: STAR + // ATL_ANTLR3.g:1:483: MINUS { - mSTAR(); + mMINUS(); } break; case 81 : - // ATL_ANTLR3.g:1:371: SLASH + // ATL_ANTLR3.g:1:489: STAR { - mSLASH(); + mSTAR(); } break; case 82 : - // ATL_ANTLR3.g:1:377: PLUS + // ATL_ANTLR3.g:1:494: SLASH { - mPLUS(); + mSLASH(); } break; case 83 : - // ATL_ANTLR3.g:1:382: EQ + // ATL_ANTLR3.g:1:500: PLUS { - mEQ(); + mPLUS(); } break; case 84 : - // ATL_ANTLR3.g:1:385: GT + // ATL_ANTLR3.g:1:505: EQ { - mGT(); + mEQ(); } break; case 85 : - // ATL_ANTLR3.g:1:388: LT + // ATL_ANTLR3.g:1:508: GT { - mLT(); + mGT(); } break; case 86 : - // ATL_ANTLR3.g:1:391: GE + // ATL_ANTLR3.g:1:511: LT { - mGE(); + mLT(); } break; case 87 : - // ATL_ANTLR3.g:1:394: LE + // ATL_ANTLR3.g:1:514: GE { - mLE(); + mGE(); } break; case 88 : - // ATL_ANTLR3.g:1:397: NE + // ATL_ANTLR3.g:1:517: LE { - mNE(); + mLE(); } break; case 89 : - // ATL_ANTLR3.g:1:400: LARROW + // ATL_ANTLR3.g:1:520: NE { - mLARROW(); + mNE(); } break; case 90 : - // ATL_ANTLR3.g:1:407: ASSIGNARROW + // ATL_ANTLR3.g:1:523: LARROW { - mASSIGNARROW(); + mLARROW(); } break; case 91 : - // ATL_ANTLR3.g:1:419: COMMENT + // ATL_ANTLR3.g:1:530: ASSIGNARROW { - mCOMMENT(); + mASSIGNARROW(); } break; case 92 : - // ATL_ANTLR3.g:1:427: STRING + // ATL_ANTLR3.g:1:542: COMMENT { - mSTRING(); + mCOMMENT(); } break; @@ -5959,6 +3568,567 @@ public class ATL_ANTLR3Lexer extends Lexer { } + protected DFA16 dfa16 = new DFA16(this); + static final String DFA16_eotS = + "\1\uffff\31\34\24\uffff\1\146\4\uffff\1\150\1\155\23\34\1\u0083"+ + "\6\34\1\u008c\1\u008d\2\34\1\u0090\16\34\1\u00a0\1\34\12\uffff\1"+ + "\u00a3\6\34\1\u00ab\3\34\1\u00af\5\34\1\u00b5\1\34\1\u00b7\1\34"+ + "\1\uffff\1\34\1\u00ba\1\34\1\u00bc\4\34\2\uffff\2\34\1\uffff\5\34"+ + "\1\u00cb\1\34\1\u00cd\2\34\1\u00d0\4\34\1\uffff\1\u00d5\1\34\1\uffff"+ + "\4\34\1\u00db\1\u00dc\1\34\1\uffff\2\34\1\u00e0\1\uffff\1\34\1\u00e2"+ + "\3\34\1\uffff\1\34\1\uffff\1\u00e7\1\34\1\uffff\1\34\1\uffff\4\34"+ + "\1\u00ee\2\34\1\u00f1\1\u00f2\5\34\1\uffff\1\34\1\uffff\2\34\1\uffff"+ + "\2\34\1\u00fd\1\34\1\uffff\5\34\2\uffff\1\34\1\u0105\1\34\1\uffff"+ + "\1\u0107\1\uffff\1\u0108\3\34\1\uffff\5\34\1\u0111\1\uffff\2\34"+ + "\2\uffff\4\34\1\u0118\3\34\1\u011d\1\34\1\uffff\1\34\1\u0120\1\u0121"+ + "\1\u0122\3\34\1\uffff\1\34\2\uffff\1\u0127\1\u0128\6\34\1\uffff"+ + "\4\34\1\u0133\1\34\1\uffff\2\34\1\u0137\1\34\1\uffff\2\34\3\uffff"+ + "\1\u013b\1\34\1\u013d\1\u013e\2\uffff\3\34\1\u0142\2\34\1\u0145"+ + "\1\u0146\1\34\1\u0148\1\uffff\1\34\1\u014a\1\34\1\uffff\1\34\1\u014d"+ + "\1\34\1\uffff\1\u014f\2\uffff\1\u0150\1\34\1\u0152\1\uffff\1\34"+ + "\1\u0154\2\uffff\1\34\1\uffff\1\34\1\uffff\1\u0157\1\34\1\uffff"+ + "\1\34\2\uffff\1\u015a\1\uffff\1\34\1\uffff\2\34\1\uffff\1\u015e"+ + "\1\34\1\uffff\1\u0160\1\34\1\u0162\1\uffff\1\u0163\1\uffff\1\34"+ + "\2\uffff\1\u0165\1\uffff"; + static final String DFA16_eofS = + "\u0166\uffff"; + static final String DFA16_minS = + "\1\11\1\141\1\157\1\145\2\141\1\165\1\156\2\145\1\157\1\142\1\154"+ + "\1\146\1\150\1\143\1\165\1\141\1\145\1\141\1\165\1\156\1\145\1\157"+ + "\1\162\1\157\24\uffff\1\55\4\uffff\1\75\1\55\1\144\1\160\1\145\1"+ + "\156\1\146\1\154\1\157\1\162\1\154\1\142\1\172\1\164\2\145\1\151"+ + "\1\154\1\146\1\163\1\157\1\60\1\144\1\163\1\144\1\164\1\144\1\163"+ + "\2\60\1\145\1\160\1\60\1\165\1\145\1\154\1\144\1\160\1\147\1\157"+ + "\1\161\1\162\2\160\1\164\1\141\1\154\1\60\1\162\12\uffff\1\60\1"+ + "\163\1\141\1\164\1\151\1\145\1\155\1\60\1\163\1\162\1\171\1\60\1"+ + "\162\1\163\1\156\1\161\1\160\1\60\1\164\1\60\1\160\1\uffff\1\145"+ + "\1\60\1\164\1\60\1\145\1\162\1\151\1\145\2\uffff\1\162\1\154\1\uffff"+ + "\1\145\1\156\1\101\2\145\1\60\1\154\1\60\1\165\1\151\1\60\1\154"+ + "\1\145\2\154\1\uffff\1\60\1\154\1\uffff\1\124\1\164\1\145\1\156"+ + "\2\60\1\141\1\uffff\1\145\1\141\1\60\1\uffff\1\171\1\60\1\147\1"+ + "\165\1\145\1\uffff\1\151\1\uffff\1\60\1\146\1\uffff\1\162\1\uffff"+ + "\1\156\1\171\1\157\1\146\1\60\1\141\1\151\2\60\1\156\1\171\1\156"+ + "\2\162\1\uffff\1\145\1\uffff\1\145\1\156\1\uffff\1\145\1\147\1\60"+ + "\1\145\1\uffff\1\145\1\157\1\145\1\170\1\151\2\uffff\1\143\1\60"+ + "\1\162\1\uffff\1\60\1\uffff\1\60\1\145\1\162\1\156\1\uffff\2\141"+ + "\1\144\1\160\1\151\1\60\1\uffff\1\164\1\145\2\uffff\1\144\1\160"+ + "\1\171\1\145\1\60\1\141\1\156\1\147\1\60\1\145\1\uffff\1\143\3\60"+ + "\1\164\1\156\1\150\1\uffff\1\171\2\uffff\2\60\1\143\1\165\1\143"+ + "\1\163\1\157\1\156\1\uffff\1\145\1\163\2\145\1\60\1\144\1\uffff"+ + "\1\156\1\143\1\60\1\171\1\uffff\1\162\1\164\3\uffff\1\60\1\147\2"+ + "\60\2\uffff\1\164\1\154\1\164\1\60\1\151\1\164\2\60\1\146\1\60\1"+ + "\uffff\1\123\1\60\1\145\1\uffff\1\160\1\60\1\151\1\uffff\1\60\2"+ + "\uffff\1\60\1\164\1\60\1\uffff\1\156\1\60\2\uffff\1\151\1\uffff"+ + "\1\145\1\uffff\1\60\1\145\1\uffff\1\157\2\uffff\1\60\1\uffff\1\164"+ + "\1\uffff\1\156\1\164\1\uffff\1\60\1\156\1\uffff\1\60\1\145\1\60"+ + "\1\uffff\1\60\1\uffff\1\144\2\uffff\1\60\1\uffff"; + static final String DFA16_maxS = + "\1\u00ff\1\157\1\162\1\165\1\162\1\151\1\165\1\163\1\145\1\162\1"+ + "\157\1\156\1\170\1\164\2\162\1\165\1\157\1\164\1\141\1\165\1\156"+ + "\1\145\1\157\1\162\1\157\24\uffff\1\76\4\uffff\1\75\1\76\1\144\1"+ + "\160\1\145\1\156\1\146\1\154\1\157\1\162\1\154\1\142\1\172\1\164"+ + "\1\145\2\151\1\154\1\146\1\166\1\157\1\u00ff\1\164\1\163\1\144\2"+ + "\164\1\163\2\u00ff\1\145\1\160\1\u00ff\1\165\1\145\1\154\1\144\1"+ + "\160\1\147\1\157\1\164\1\162\2\160\1\164\1\141\1\154\1\u00ff\1\162"+ + "\12\uffff\1\u00ff\1\163\1\141\1\164\1\151\1\145\1\155\1\u00ff\1"+ + "\163\1\162\1\171\1\u00ff\1\162\1\163\1\156\1\161\1\160\1\u00ff\1"+ + "\164\1\u00ff\1\160\1\uffff\1\145\1\u00ff\1\164\1\u00ff\1\145\1\162"+ + "\1\160\1\145\2\uffff\1\162\1\154\1\uffff\1\145\1\156\1\125\2\145"+ + "\1\u00ff\1\154\1\u00ff\1\165\1\151\1\u00ff\1\154\1\145\2\154\1\uffff"+ + "\1\u00ff\1\154\1\uffff\1\124\1\164\1\145\1\156\2\u00ff\1\141\1\uffff"+ + "\1\145\1\141\1\u00ff\1\uffff\1\171\1\u00ff\1\147\1\165\1\145\1\uffff"+ + "\1\151\1\uffff\1\u00ff\1\146\1\uffff\1\162\1\uffff\1\156\1\171\1"+ + "\157\1\146\1\u00ff\1\141\1\151\2\u00ff\1\156\1\171\1\156\2\162\1"+ + "\uffff\1\145\1\uffff\1\145\1\156\1\uffff\1\145\1\147\1\u00ff\1\145"+ + "\1\uffff\1\145\1\157\1\145\1\170\1\151\2\uffff\1\143\1\u00ff\1\162"+ + "\1\uffff\1\u00ff\1\uffff\1\u00ff\1\145\1\162\1\156\1\uffff\2\141"+ + "\1\144\1\160\1\151\1\u00ff\1\uffff\1\164\1\145\2\uffff\1\144\1\160"+ + "\1\171\1\145\1\u00ff\1\141\1\156\1\147\1\u00ff\1\145\1\uffff\1\143"+ + "\3\u00ff\1\164\1\156\1\150\1\uffff\1\171\2\uffff\2\u00ff\1\143\1"+ + "\165\1\143\1\163\1\157\1\156\1\uffff\1\145\1\163\2\145\1\u00ff\1"+ + "\144\1\uffff\1\156\1\143\1\u00ff\1\171\1\uffff\1\162\1\164\3\uffff"+ + "\1\u00ff\1\147\2\u00ff\2\uffff\1\164\1\154\1\164\1\u00ff\1\151\1"+ + "\164\2\u00ff\1\146\1\u00ff\1\uffff\1\123\1\u00ff\1\145\1\uffff\1"+ + "\160\1\u00ff\1\151\1\uffff\1\u00ff\2\uffff\1\u00ff\1\164\1\u00ff"+ + "\1\uffff\1\156\1\u00ff\2\uffff\1\151\1\uffff\1\145\1\uffff\1\u00ff"+ + "\1\145\1\uffff\1\157\2\uffff\1\u00ff\1\uffff\1\164\1\uffff\1\156"+ + "\1\164\1\uffff\1\u00ff\1\156\1\uffff\1\u00ff\1\145\1\u00ff\1\uffff"+ + "\1\u00ff\1\uffff\1\144\2\uffff\1\u00ff\1\uffff"; + static final String DFA16_acceptS = + "\32\uffff\1\73\1\74\1\75\1\76\1\77\1\100\1\101\1\102\1\103\1\104"+ + "\1\105\1\106\1\107\1\110\1\111\1\112\1\113\1\114\1\115\1\116\1\uffff"+ + "\1\121\1\122\1\123\1\124\61\uffff\1\117\1\134\1\120\1\127\1\125"+ + "\1\130\1\131\1\132\1\133\1\126\25\uffff\1\32\10\uffff\1\24\1\33"+ + "\2\uffff\1\25\17\uffff\1\70\2\uffff\1\66\7\uffff\1\35\3\uffff\1"+ + "\45\5\uffff\1\11\1\uffff\1\65\2\uffff\1\64\1\uffff\1\67\16\uffff"+ + "\1\46\1\uffff\1\47\2\uffff\1\52\4\uffff\1\71\5\uffff\1\15\1\4\3"+ + "\uffff\1\21\1\uffff\1\7\4\uffff\1\31\6\uffff\1\34\2\uffff\1\40\1"+ + "\42\12\uffff\1\60\7\uffff\1\41\1\uffff\1\6\1\17\10\uffff\1\43\6"+ + "\uffff\1\44\4\uffff\1\53\2\uffff\1\1\1\26\1\2\4\uffff\1\20\1\10"+ + "\12\uffff\1\55\3\uffff\1\62\3\uffff\1\12\1\uffff\1\30\1\5\3\uffff"+ + "\1\16\2\uffff\1\36\1\72\1\uffff\1\54\1\uffff\1\61\2\uffff\1\57\1"+ + "\uffff\1\3\1\27\1\uffff\1\14\1\uffff\1\23\2\uffff\1\51\2\uffff\1"+ + "\13\3\uffff\1\56\1\uffff\1\22\1\uffff\1\50\1\63\1\uffff\1\37"; + static final String DFA16_specialS = + "\u0166\uffff}>"; + static final String[] DFA16_transitionS = { + "\1\33\1\32\2\uffff\1\32\22\uffff\1\33\1\41\1\34\1\52\3\uffff"+ + "\1\36\1\43\1\44\1\57\1\61\1\42\1\56\1\55\1\60\12\35\1\50\1\47"+ + "\1\64\1\62\1\63\1\53\1\54\1\34\1\21\1\27\5\34\1\25\3\34\1\23"+ + "\1\34\1\17\2\34\1\26\1\22\1\24\6\34\1\37\1\uffff\1\40\1\uffff"+ + "\1\34\1\uffff\1\13\1\34\1\2\1\11\1\14\1\4\1\34\1\10\1\15\2\34"+ + "\1\5\1\1\1\12\1\30\1\34\1\6\1\3\1\20\1\16\1\7\2\34\1\31\2\34"+ + "\1\45\1\51\1\46\102\uffff\27\34\1\uffff\37\34\1\uffff\10\34", + "\1\66\15\uffff\1\65", + "\1\70\2\uffff\1\67", + "\1\71\17\uffff\1\72", + "\1\75\15\uffff\1\74\2\uffff\1\73", + "\1\77\3\uffff\1\100\3\uffff\1\76", + "\1\101", + "\1\103\4\uffff\1\102", + "\1\104", + "\1\105\3\uffff\1\106\5\uffff\1\110\2\uffff\1\107", + "\1\111", + "\1\112\13\uffff\1\113", + "\1\116\1\uffff\1\115\11\uffff\1\114", + "\1\120\6\uffff\1\122\1\117\5\uffff\1\121", + "\1\125\6\uffff\1\123\2\uffff\1\124", + "\1\126\16\uffff\1\127", + "\1\130", + "\1\131\15\uffff\1\132", + "\1\133\16\uffff\1\134", + "\1\135", + "\1\136", + "\1\137", + "\1\140", + "\1\141", + "\1\142", + "\1\143", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "\1\145\20\uffff\1\144", + "", + "", + "", + "", + "\1\147", + "\1\153\14\uffff\1\154\2\uffff\1\151\1\152", + "\1\156", + "\1\157", + "\1\160", + "\1\161", + "\1\162", + "\1\163", + "\1\164", + "\1\165", + "\1\166", + "\1\167", + "\1\170", + "\1\171", + "\1\172", + "\1\173\3\uffff\1\174", + "\1\175", + "\1\176", + "\1\177", + "\1\u0080\2\uffff\1\u0081", + "\1\u0082", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0084\17\uffff\1\u0085", + "\1\u0086", + "\1\u0087", + "\1\u0088", + "\1\u008a\17\uffff\1\u0089", + "\1\u008b", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u008e", + "\1\u008f", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0091", + "\1\u0092", + "\1\u0093", + "\1\u0094", + "\1\u0095", + "\1\u0096", + "\1\u0097", + "\1\u0099\2\uffff\1\u0098", + "\1\u009a", + "\1\u009b", + "\1\u009c", + "\1\u009d", + "\1\u009e", + "\1\u009f", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00a1", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\24\34\1\u00a2\5\34"+ + "\105\uffff\27\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00a4", + "\1\u00a5", + "\1\u00a6", + "\1\u00a7", + "\1\u00a8", + "\1\u00a9", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\4\34\1\u00aa\25\34"+ + "\105\uffff\27\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00ac", + "\1\u00ad", + "\1\u00ae", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00b0", + "\1\u00b1", + "\1\u00b2", + "\1\u00b3", + "\1\u00b4", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00b6", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00b8", + "", + "\1\u00b9", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00bb", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00bd", + "\1\u00be", + "\1\u00c0\6\uffff\1\u00bf", + "\1\u00c1", + "", + "", + "\1\u00c2", + "\1\u00c3", + "", + "\1\u00c4", + "\1\u00c5", + "\1\u00c8\22\uffff\1\u00c7\1\u00c6", + "\1\u00c9", + "\1\u00ca", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00cc", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00ce", + "\1\u00cf", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00d1", + "\1\u00d2", + "\1\u00d3", + "\1\u00d4", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00d6", + "", + "\1\u00d7", + "\1\u00d8", + "\1\u00d9", + "\1\u00da", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00dd", + "", + "\1\u00de", + "\1\u00df", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "\1\u00e1", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00e3", + "\1\u00e4", + "\1\u00e5", + "", + "\1\u00e6", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00e8", + "", + "\1\u00e9", + "", + "\1\u00ea", + "\1\u00eb", + "\1\u00ec", + "\1\u00ed", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00ef", + "\1\u00f0", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00f3", + "\1\u00f4", + "\1\u00f5", + "\1\u00f6", + "\1\u00f7", + "", + "\1\u00f8", + "", + "\1\u00f9", + "\1\u00fa", + "", + "\1\u00fb", + "\1\u00fc", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u00fe", + "", + "\1\u00ff", + "\1\u0100", + "\1\u0101", + "\1\u0102", + "\1\u0103", + "", + "", + "\1\u0104", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0106", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0109", + "\1\u010a", + "\1\u010b", + "", + "\1\u010c", + "\1\u010d", + "\1\u010e", + "\1\u010f", + "\1\u0110", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "\1\u0112", + "\1\u0113", + "", + "", + "\1\u0114", + "\1\u0115", + "\1\u0116", + "\1\u0117", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0119", + "\1\u011a", + "\1\u011b", + "\12\34\7\uffff\23\34\1\u011c\6\34\4\uffff\1\34\1\uffff\32\34"+ + "\105\uffff\27\34\1\uffff\37\34\1\uffff\10\34", + "\1\u011e", + "", + "\1\u011f", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0123", + "\1\u0124", + "\1\u0125", + "", + "\1\u0126", + "", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0129", + "\1\u012a", + "\1\u012b", + "\1\u012c", + "\1\u012d", + "\1\u012e", + "", + "\1\u012f", + "\1\u0130", + "\1\u0131", + "\1\u0132", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0134", + "", + "\1\u0135", + "\1\u0136", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0138", + "", + "\1\u0139", + "\1\u013a", + "", + "", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u013c", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "", + "\1\u013f", + "\1\u0140", + "\1\u0141", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0143", + "\1\u0144", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0147", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "\1\u0149", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u014b", + "", + "\1\u014c", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u014e", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0151", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "\1\u0153", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "", + "\1\u0155", + "", + "\1\u0156", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0158", + "", + "\1\u0159", + "", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "\1\u015b", + "", + "\1\u015c", + "\1\u015d", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u015f", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "\1\u0161", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "", + "\1\u0164", + "", + "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34\105\uffff\27"+ + "\34\1\uffff\37\34\1\uffff\10\34", + "" + }; + + static final short[] DFA16_eot = DFA.unpackEncodedString(DFA16_eotS); + static final short[] DFA16_eof = DFA.unpackEncodedString(DFA16_eofS); + static final char[] DFA16_min = DFA.unpackEncodedStringToUnsignedChars(DFA16_minS); + static final char[] DFA16_max = DFA.unpackEncodedStringToUnsignedChars(DFA16_maxS); + static final short[] DFA16_accept = DFA.unpackEncodedString(DFA16_acceptS); + static final short[] DFA16_special = DFA.unpackEncodedString(DFA16_specialS); + static final short[][] DFA16_transition; + + static { + int numStates = DFA16_transitionS.length; + DFA16_transition = new short[numStates][]; + for (int i=0; i<numStates; i++) { + DFA16_transition[i] = DFA.unpackEncodedString(DFA16_transitionS[i]); + } + } + + class DFA16 extends DFA { + + public DFA16(BaseRecognizer recognizer) { + this.recognizer = recognizer; + this.decisionNumber = 16; + this.eot = DFA16_eot; + this.eof = DFA16_eof; + this.min = DFA16_min; + this.max = DFA16_max; + this.accept = DFA16_accept; + this.special = DFA16_special; + this.transition = DFA16_transition; + } + public String getDescription() { + return "1:1: Tokens : ( T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | NL | WS | NAME | INT | STRING | LSQUARE | RSQUARE | EXCL | COMA | LPAREN | RPAREN | LCURLY | RCURLY | SEMI | COLON | PIPE | SHARP | QMARK | AROBAS | POINT | RARROW | MINUS | STAR | SLASH | PLUS | EQ | GT | LT | GE | LE | NE | LARROW | ASSIGNARROW | COMMENT );"; + } + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3Parser.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3Parser.java index a09af57e..bccc5b10 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3Parser.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3Parser.java @@ -1,15 +1,4 @@ -/** - * Copyright (c) 2008 INRIA. - * 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: - * INRIA - initial API and implementation - * - */ -// $ANTLR 3.0.1 ATL_ANTLR3.g 2011-05-04 14:11:57 +// $ANTLR 3.2 Sep 23, 2009 12:02:23 ATL_ANTLR3.g 2019-12-05 18:08:48 package org.eclipse.m2m.atl.dsls.tcs.injector; import org.antlr.runtime.*; @@ -22,54 +11,119 @@ public class ATL_ANTLR3Parser extends Parser { public static final String[] tokenNames = new String[] { "<invalid>", "<EOR>", "<DOWN>", "<UP>", "NAME", "STRING", "INT", "FLOAT", "SEMI", "COMA", "EQ", "COLON", "LPAREN", "RPAREN", "LCURLY", "RCURLY", "RARROW", "ASSIGNARROW", "LARROW", "EXCL", "PIPE", "SHARP", "POINT", "MINUS", "STAR", "SLASH", "PLUS", "GT", "LT", "GE", "LE", "NE", "NL", "WS", "DIGIT", "ALPHA", "SNAME", "ESC", "LSQUARE", "RSQUARE", "QMARK", "AROBAS", "COMMENT", "'module'", "'create'", "'refining'", "'from'", "'library'", "'query'", "'uses'", "'helper'", "'def'", "'context'", "'nodefault'", "'abstract'", "'rule'", "'extends'", "'using'", "'unique'", "'lazy'", "'entrypoint'", "'endpoint'", "'in'", "'to'", "'mapsTo'", "'distinct'", "'foreach'", "'drop'", "'do'", "'if'", "'else'", "'for'", "'iterate'", "'OclUndefined'", "'true'", "'false'", "'then'", "'endif'", "'super'", "'let'", "'Bag'", "'Set'", "'OrderedSet'", "'Sequence'", "'Map'", "'Tuple'", "'OclType'", "'OclAny'", "'TupleType'", "'Integer'", "'Real'", "'Boolean'", "'String'", "'Collection'", "'not'", "'div'", "'mod'", "'and'", "'or'", "'xor'", "'implies'" }; - public static final int GE=29; - public static final int LT=28; - public static final int STAR=24; - public static final int ASSIGNARROW=17; - public static final int LSQUARE=38; - public static final int SHARP=21; - public static final int POINT=22; - public static final int AROBAS=41; + public static final int T__50=50; + public static final int QMARK=40; + public static final int MINUS=23; + public static final int RSQUARE=39; + public static final int T__59=59; + public static final int T__55=55; + public static final int T__56=56; + public static final int T__57=57; + public static final int T__58=58; + public static final int T__51=51; + public static final int T__52=52; + public static final int T__53=53; + public static final int T__54=54; + public static final int COMA=9; + public static final int T__60=60; + public static final int T__61=61; + public static final int LPAREN=12; + public static final int T__66=66; + public static final int T__67=67; + public static final int T__68=68; + public static final int T__69=69; + public static final int T__62=62; + public static final int T__63=63; + public static final int T__64=64; + public static final int T__65=65; + public static final int SEMI=8; + public static final int COMMENT=42; public static final int ESC=37; + public static final int RCURLY=15; + public static final int AROBAS=41; + public static final int LCURLY=14; public static final int RARROW=16; + public static final int T__48=48; + public static final int STAR=24; + public static final int T__49=49; public static final int LARROW=18; - public static final int LCURLY=14; - public static final int FLOAT=7; - public static final int INT=6; + public static final int T__44=44; + public static final int T__45=45; + public static final int STRING=5; + public static final int SHARP=21; + public static final int LE=30; + public static final int T__46=46; + public static final int T__47=47; public static final int EXCL=19; - public static final int RSQUARE=39; - public static final int MINUS=23; - public static final int EOF=-1; - public static final int COMA=9; - public static final int SEMI=8; + public static final int T__43=43; + public static final int T__91=91; + public static final int T__100=100; + public static final int T__92=92; + public static final int T__93=93; + public static final int T__94=94; + public static final int T__90=90; + public static final int LT=28; public static final int ALPHA=35; - public static final int LPAREN=12; - public static final int COLON=11; + public static final int PIPE=20; + public static final int T__99=99; + public static final int T__95=95; + public static final int T__96=96; + public static final int T__97=97; + public static final int T__98=98; public static final int RPAREN=13; + public static final int EQ=10; public static final int NAME=4; + public static final int ASSIGNARROW=17; + public static final int NE=31; + public static final int NL=32; + public static final int PLUS=26; + public static final int T__70=70; + public static final int T__71=71; + public static final int FLOAT=7; + public static final int T__72=72; + public static final int INT=6; + public static final int T__77=77; + public static final int T__78=78; + public static final int T__79=79; + public static final int T__73=73; public static final int WS=33; + public static final int EOF=-1; + public static final int T__74=74; + public static final int T__75=75; + public static final int GE=29; + public static final int T__76=76; + public static final int T__80=80; + public static final int T__81=81; + public static final int T__82=82; + public static final int T__83=83; public static final int SLASH=25; public static final int SNAME=36; - public static final int RCURLY=15; + public static final int COLON=11; public static final int GT=27; - public static final int PLUS=26; - public static final int PIPE=20; public static final int DIGIT=34; - public static final int NL=32; - public static final int EQ=10; - public static final int COMMENT=42; - public static final int QMARK=40; - public static final int LE=30; - public static final int STRING=5; - public static final int NE=31; + public static final int LSQUARE=38; + public static final int T__88=88; + public static final int T__89=89; + public static final int T__84=84; + public static final int POINT=22; + public static final int T__85=85; + public static final int T__86=86; + public static final int T__87=87; + + // delegates + // delegators + public ATL_ANTLR3Parser(TokenStream input) { - super(input); - ruleMemo = new HashMap[318+1]; - } + this(input, new RecognizerSharedState()); + } + public ATL_ANTLR3Parser(TokenStream input, RecognizerSharedState state) { + super(input, state); + + } - public String[] getTokenNames() { return tokenNames; } + public String[] getTokenNames() { return ATL_ANTLR3Parser.tokenNames; } public String getGrammarFileName() { return "ATL_ANTLR3.g"; } @@ -108,7 +162,7 @@ public class ATL_ANTLR3Parser extends Parser { - // $ANTLR start main + // $ANTLR start "main" // ATL_ANTLR3.g:63:1: main returns [Object ret2] : ( (ret= unit ) EOF ) ; public final Object main() throws RecognitionException { Object ret2 = null; @@ -128,16 +182,17 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_unit_in_main61); ret=unit(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } - match(input,EOF,FOLLOW_EOF_in_main64); if (failed) return ret2; + match(input,EOF,FOLLOW_EOF_in_main64); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -154,10 +209,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end main + // $ANTLR end "main" - // $ANTLR start identifier + // $ANTLR start "identifier" // ATL_ANTLR3.g:71:1: identifier returns [Object ret2] : ast= NAME ; public final Object identifier() throws RecognitionException { Object ret2 = null; @@ -169,12 +224,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:72:2: (ast= NAME ) // ATL_ANTLR3.g:72:4: ast= NAME { - ast=(Token)input.LT(1); - match(input,NAME,FOLLOW_NAME_in_identifier97); if (failed) return ret2; - if ( backtracking==0 ) { + ast=(Token)match(input,NAME,FOLLOW_NAME_in_identifier97); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = ast.getText(); ei.setToken((Object)ast); } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -191,10 +245,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end identifier + // $ANTLR end "identifier" - // $ANTLR start identifierOrKeyword + // $ANTLR start "identifierOrKeyword" // ATL_ANTLR3.g:79:1: identifierOrKeyword returns [Object ret2] : (ast= NAME | 'module' | 'create' | 'refining' | 'from' | 'library' | 'query' | 'uses' | 'helper' | 'def' | 'context' | 'nodefault' | 'abstract' | 'rule' | 'extends' | 'using' | 'unique' | 'lazy' | 'entrypoint' | 'endpoint' | 'in' | 'to' | 'mapsTo' | 'distinct' | 'foreach' | 'drop' | 'do' | 'if' | 'else' | 'for' | 'iterate' | 'OclUndefined' | 'true' | 'false' | 'then' | 'endif' | 'super' | 'let' | 'Bag' | 'Set' | 'OrderedSet' | 'Sequence' | 'Map' | 'Tuple' | 'OclType' | 'OclAny' | 'TupleType' | 'Integer' | 'Real' | 'Boolean' | 'String' | 'Collection' | 'not' | 'div' | 'mod' | 'and' | 'or' | 'xor' | 'implies' ) ; public final Object identifierOrKeyword() throws RecognitionException { Object ret2 = null; @@ -505,9 +559,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("80:4: (ast= NAME | 'module' | 'create' | 'refining' | 'from' | 'library' | 'query' | 'uses' | 'helper' | 'def' | 'context' | 'nodefault' | 'abstract' | 'rule' | 'extends' | 'using' | 'unique' | 'lazy' | 'entrypoint' | 'endpoint' | 'in' | 'to' | 'mapsTo' | 'distinct' | 'foreach' | 'drop' | 'do' | 'if' | 'else' | 'for' | 'iterate' | 'OclUndefined' | 'true' | 'false' | 'then' | 'endif' | 'super' | 'let' | 'Bag' | 'Set' | 'OrderedSet' | 'Sequence' | 'Map' | 'Tuple' | 'OclType' | 'OclAny' | 'TupleType' | 'Integer' | 'Real' | 'Boolean' | 'String' | 'Collection' | 'not' | 'div' | 'mod' | 'and' | 'or' | 'xor' | 'implies' )", 1, 0, input); + new NoViableAltException("", 1, 0, input); throw nvae; } @@ -516,9 +570,8 @@ public class ATL_ANTLR3Parser extends Parser { case 1 : // ATL_ANTLR3.g:80:5: ast= NAME { - ast=(Token)input.LT(1); - match(input,NAME,FOLLOW_NAME_in_identifierOrKeyword132); if (failed) return ret2; - if ( backtracking==0 ) { + ast=(Token)match(input,NAME,FOLLOW_NAME_in_identifierOrKeyword132); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = ast.getText(); ei.setToken((Object)ast); } @@ -527,8 +580,8 @@ public class ATL_ANTLR3Parser extends Parser { case 2 : // ATL_ANTLR3.g:80:64: 'module' { - match(input,43,FOLLOW_43_in_identifierOrKeyword137); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,43,FOLLOW_43_in_identifierOrKeyword137); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "module"; } @@ -537,8 +590,8 @@ public class ATL_ANTLR3Parser extends Parser { case 3 : // ATL_ANTLR3.g:80:92: 'create' { - match(input,44,FOLLOW_44_in_identifierOrKeyword142); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,44,FOLLOW_44_in_identifierOrKeyword142); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "create"; } @@ -547,8 +600,8 @@ public class ATL_ANTLR3Parser extends Parser { case 4 : // ATL_ANTLR3.g:80:120: 'refining' { - match(input,45,FOLLOW_45_in_identifierOrKeyword147); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,45,FOLLOW_45_in_identifierOrKeyword147); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "refining"; } @@ -557,8 +610,8 @@ public class ATL_ANTLR3Parser extends Parser { case 5 : // ATL_ANTLR3.g:80:152: 'from' { - match(input,46,FOLLOW_46_in_identifierOrKeyword152); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,46,FOLLOW_46_in_identifierOrKeyword152); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "from"; } @@ -567,8 +620,8 @@ public class ATL_ANTLR3Parser extends Parser { case 6 : // ATL_ANTLR3.g:80:176: 'library' { - match(input,47,FOLLOW_47_in_identifierOrKeyword157); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,47,FOLLOW_47_in_identifierOrKeyword157); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "library"; } @@ -577,8 +630,8 @@ public class ATL_ANTLR3Parser extends Parser { case 7 : // ATL_ANTLR3.g:80:206: 'query' { - match(input,48,FOLLOW_48_in_identifierOrKeyword162); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,48,FOLLOW_48_in_identifierOrKeyword162); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "query"; } @@ -587,8 +640,8 @@ public class ATL_ANTLR3Parser extends Parser { case 8 : // ATL_ANTLR3.g:80:232: 'uses' { - match(input,49,FOLLOW_49_in_identifierOrKeyword167); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,49,FOLLOW_49_in_identifierOrKeyword167); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "uses"; } @@ -597,8 +650,8 @@ public class ATL_ANTLR3Parser extends Parser { case 9 : // ATL_ANTLR3.g:80:256: 'helper' { - match(input,50,FOLLOW_50_in_identifierOrKeyword172); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,50,FOLLOW_50_in_identifierOrKeyword172); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "helper"; } @@ -607,8 +660,8 @@ public class ATL_ANTLR3Parser extends Parser { case 10 : // ATL_ANTLR3.g:80:284: 'def' { - match(input,51,FOLLOW_51_in_identifierOrKeyword177); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,51,FOLLOW_51_in_identifierOrKeyword177); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "def"; } @@ -617,8 +670,8 @@ public class ATL_ANTLR3Parser extends Parser { case 11 : // ATL_ANTLR3.g:80:306: 'context' { - match(input,52,FOLLOW_52_in_identifierOrKeyword182); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,52,FOLLOW_52_in_identifierOrKeyword182); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "context"; } @@ -627,8 +680,8 @@ public class ATL_ANTLR3Parser extends Parser { case 12 : // ATL_ANTLR3.g:80:336: 'nodefault' { - match(input,53,FOLLOW_53_in_identifierOrKeyword187); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,53,FOLLOW_53_in_identifierOrKeyword187); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "nodefault"; } @@ -637,8 +690,8 @@ public class ATL_ANTLR3Parser extends Parser { case 13 : // ATL_ANTLR3.g:80:370: 'abstract' { - match(input,54,FOLLOW_54_in_identifierOrKeyword192); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,54,FOLLOW_54_in_identifierOrKeyword192); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "abstract"; } @@ -647,8 +700,8 @@ public class ATL_ANTLR3Parser extends Parser { case 14 : // ATL_ANTLR3.g:80:402: 'rule' { - match(input,55,FOLLOW_55_in_identifierOrKeyword197); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,55,FOLLOW_55_in_identifierOrKeyword197); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "rule"; } @@ -657,8 +710,8 @@ public class ATL_ANTLR3Parser extends Parser { case 15 : // ATL_ANTLR3.g:80:426: 'extends' { - match(input,56,FOLLOW_56_in_identifierOrKeyword202); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,56,FOLLOW_56_in_identifierOrKeyword202); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "extends"; } @@ -667,8 +720,8 @@ public class ATL_ANTLR3Parser extends Parser { case 16 : // ATL_ANTLR3.g:80:456: 'using' { - match(input,57,FOLLOW_57_in_identifierOrKeyword207); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,57,FOLLOW_57_in_identifierOrKeyword207); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "using"; } @@ -677,8 +730,8 @@ public class ATL_ANTLR3Parser extends Parser { case 17 : // ATL_ANTLR3.g:80:482: 'unique' { - match(input,58,FOLLOW_58_in_identifierOrKeyword212); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,58,FOLLOW_58_in_identifierOrKeyword212); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "unique"; } @@ -687,8 +740,8 @@ public class ATL_ANTLR3Parser extends Parser { case 18 : // ATL_ANTLR3.g:80:510: 'lazy' { - match(input,59,FOLLOW_59_in_identifierOrKeyword217); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,59,FOLLOW_59_in_identifierOrKeyword217); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "lazy"; } @@ -697,8 +750,8 @@ public class ATL_ANTLR3Parser extends Parser { case 19 : // ATL_ANTLR3.g:80:534: 'entrypoint' { - match(input,60,FOLLOW_60_in_identifierOrKeyword222); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,60,FOLLOW_60_in_identifierOrKeyword222); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "entrypoint"; } @@ -707,8 +760,8 @@ public class ATL_ANTLR3Parser extends Parser { case 20 : // ATL_ANTLR3.g:80:570: 'endpoint' { - match(input,61,FOLLOW_61_in_identifierOrKeyword227); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,61,FOLLOW_61_in_identifierOrKeyword227); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "endpoint"; } @@ -717,8 +770,8 @@ public class ATL_ANTLR3Parser extends Parser { case 21 : // ATL_ANTLR3.g:80:602: 'in' { - match(input,62,FOLLOW_62_in_identifierOrKeyword232); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,62,FOLLOW_62_in_identifierOrKeyword232); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "in"; } @@ -727,8 +780,8 @@ public class ATL_ANTLR3Parser extends Parser { case 22 : // ATL_ANTLR3.g:80:622: 'to' { - match(input,63,FOLLOW_63_in_identifierOrKeyword237); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,63,FOLLOW_63_in_identifierOrKeyword237); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "to"; } @@ -737,8 +790,8 @@ public class ATL_ANTLR3Parser extends Parser { case 23 : // ATL_ANTLR3.g:80:642: 'mapsTo' { - match(input,64,FOLLOW_64_in_identifierOrKeyword242); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,64,FOLLOW_64_in_identifierOrKeyword242); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "mapsTo"; } @@ -747,8 +800,8 @@ public class ATL_ANTLR3Parser extends Parser { case 24 : // ATL_ANTLR3.g:80:670: 'distinct' { - match(input,65,FOLLOW_65_in_identifierOrKeyword247); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,65,FOLLOW_65_in_identifierOrKeyword247); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "distinct"; } @@ -757,8 +810,8 @@ public class ATL_ANTLR3Parser extends Parser { case 25 : // ATL_ANTLR3.g:80:702: 'foreach' { - match(input,66,FOLLOW_66_in_identifierOrKeyword252); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,66,FOLLOW_66_in_identifierOrKeyword252); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "foreach"; } @@ -767,8 +820,8 @@ public class ATL_ANTLR3Parser extends Parser { case 26 : // ATL_ANTLR3.g:80:732: 'drop' { - match(input,67,FOLLOW_67_in_identifierOrKeyword257); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,67,FOLLOW_67_in_identifierOrKeyword257); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "drop"; } @@ -777,8 +830,8 @@ public class ATL_ANTLR3Parser extends Parser { case 27 : // ATL_ANTLR3.g:80:756: 'do' { - match(input,68,FOLLOW_68_in_identifierOrKeyword262); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,68,FOLLOW_68_in_identifierOrKeyword262); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "do"; } @@ -787,8 +840,8 @@ public class ATL_ANTLR3Parser extends Parser { case 28 : // ATL_ANTLR3.g:80:776: 'if' { - match(input,69,FOLLOW_69_in_identifierOrKeyword267); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,69,FOLLOW_69_in_identifierOrKeyword267); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "if"; } @@ -797,8 +850,8 @@ public class ATL_ANTLR3Parser extends Parser { case 29 : // ATL_ANTLR3.g:80:796: 'else' { - match(input,70,FOLLOW_70_in_identifierOrKeyword272); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,70,FOLLOW_70_in_identifierOrKeyword272); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "else"; } @@ -807,8 +860,8 @@ public class ATL_ANTLR3Parser extends Parser { case 30 : // ATL_ANTLR3.g:80:820: 'for' { - match(input,71,FOLLOW_71_in_identifierOrKeyword277); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,71,FOLLOW_71_in_identifierOrKeyword277); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "for"; } @@ -817,8 +870,8 @@ public class ATL_ANTLR3Parser extends Parser { case 31 : // ATL_ANTLR3.g:80:842: 'iterate' { - match(input,72,FOLLOW_72_in_identifierOrKeyword282); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,72,FOLLOW_72_in_identifierOrKeyword282); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "iterate"; } @@ -827,8 +880,8 @@ public class ATL_ANTLR3Parser extends Parser { case 32 : // ATL_ANTLR3.g:80:872: 'OclUndefined' { - match(input,73,FOLLOW_73_in_identifierOrKeyword287); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,73,FOLLOW_73_in_identifierOrKeyword287); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "OclUndefined"; } @@ -837,8 +890,8 @@ public class ATL_ANTLR3Parser extends Parser { case 33 : // ATL_ANTLR3.g:80:912: 'true' { - match(input,74,FOLLOW_74_in_identifierOrKeyword292); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,74,FOLLOW_74_in_identifierOrKeyword292); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "true"; } @@ -847,8 +900,8 @@ public class ATL_ANTLR3Parser extends Parser { case 34 : // ATL_ANTLR3.g:80:936: 'false' { - match(input,75,FOLLOW_75_in_identifierOrKeyword297); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,75,FOLLOW_75_in_identifierOrKeyword297); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "false"; } @@ -857,8 +910,8 @@ public class ATL_ANTLR3Parser extends Parser { case 35 : // ATL_ANTLR3.g:80:962: 'then' { - match(input,76,FOLLOW_76_in_identifierOrKeyword302); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,76,FOLLOW_76_in_identifierOrKeyword302); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "then"; } @@ -867,8 +920,8 @@ public class ATL_ANTLR3Parser extends Parser { case 36 : // ATL_ANTLR3.g:80:986: 'endif' { - match(input,77,FOLLOW_77_in_identifierOrKeyword307); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,77,FOLLOW_77_in_identifierOrKeyword307); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "endif"; } @@ -877,8 +930,8 @@ public class ATL_ANTLR3Parser extends Parser { case 37 : // ATL_ANTLR3.g:80:1012: 'super' { - match(input,78,FOLLOW_78_in_identifierOrKeyword312); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,78,FOLLOW_78_in_identifierOrKeyword312); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "super"; } @@ -887,8 +940,8 @@ public class ATL_ANTLR3Parser extends Parser { case 38 : // ATL_ANTLR3.g:80:1038: 'let' { - match(input,79,FOLLOW_79_in_identifierOrKeyword317); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,79,FOLLOW_79_in_identifierOrKeyword317); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "let"; } @@ -897,8 +950,8 @@ public class ATL_ANTLR3Parser extends Parser { case 39 : // ATL_ANTLR3.g:80:1060: 'Bag' { - match(input,80,FOLLOW_80_in_identifierOrKeyword322); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,80,FOLLOW_80_in_identifierOrKeyword322); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "Bag"; } @@ -907,8 +960,8 @@ public class ATL_ANTLR3Parser extends Parser { case 40 : // ATL_ANTLR3.g:80:1082: 'Set' { - match(input,81,FOLLOW_81_in_identifierOrKeyword327); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,81,FOLLOW_81_in_identifierOrKeyword327); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "Set"; } @@ -917,8 +970,8 @@ public class ATL_ANTLR3Parser extends Parser { case 41 : // ATL_ANTLR3.g:80:1104: 'OrderedSet' { - match(input,82,FOLLOW_82_in_identifierOrKeyword332); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,82,FOLLOW_82_in_identifierOrKeyword332); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "OrderedSet"; } @@ -927,8 +980,8 @@ public class ATL_ANTLR3Parser extends Parser { case 42 : // ATL_ANTLR3.g:80:1140: 'Sequence' { - match(input,83,FOLLOW_83_in_identifierOrKeyword337); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,83,FOLLOW_83_in_identifierOrKeyword337); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "Sequence"; } @@ -937,8 +990,8 @@ public class ATL_ANTLR3Parser extends Parser { case 43 : // ATL_ANTLR3.g:80:1172: 'Map' { - match(input,84,FOLLOW_84_in_identifierOrKeyword342); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,84,FOLLOW_84_in_identifierOrKeyword342); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "Map"; } @@ -947,8 +1000,8 @@ public class ATL_ANTLR3Parser extends Parser { case 44 : // ATL_ANTLR3.g:80:1194: 'Tuple' { - match(input,85,FOLLOW_85_in_identifierOrKeyword347); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,85,FOLLOW_85_in_identifierOrKeyword347); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "Tuple"; } @@ -957,8 +1010,8 @@ public class ATL_ANTLR3Parser extends Parser { case 45 : // ATL_ANTLR3.g:80:1220: 'OclType' { - match(input,86,FOLLOW_86_in_identifierOrKeyword352); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,86,FOLLOW_86_in_identifierOrKeyword352); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "OclType"; } @@ -967,8 +1020,8 @@ public class ATL_ANTLR3Parser extends Parser { case 46 : // ATL_ANTLR3.g:80:1250: 'OclAny' { - match(input,87,FOLLOW_87_in_identifierOrKeyword357); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,87,FOLLOW_87_in_identifierOrKeyword357); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "OclAny"; } @@ -977,8 +1030,8 @@ public class ATL_ANTLR3Parser extends Parser { case 47 : // ATL_ANTLR3.g:80:1278: 'TupleType' { - match(input,88,FOLLOW_88_in_identifierOrKeyword362); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,88,FOLLOW_88_in_identifierOrKeyword362); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "TupleType"; } @@ -987,8 +1040,8 @@ public class ATL_ANTLR3Parser extends Parser { case 48 : // ATL_ANTLR3.g:80:1312: 'Integer' { - match(input,89,FOLLOW_89_in_identifierOrKeyword367); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,89,FOLLOW_89_in_identifierOrKeyword367); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "Integer"; } @@ -997,8 +1050,8 @@ public class ATL_ANTLR3Parser extends Parser { case 49 : // ATL_ANTLR3.g:80:1342: 'Real' { - match(input,90,FOLLOW_90_in_identifierOrKeyword372); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,90,FOLLOW_90_in_identifierOrKeyword372); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "Real"; } @@ -1007,8 +1060,8 @@ public class ATL_ANTLR3Parser extends Parser { case 50 : // ATL_ANTLR3.g:80:1366: 'Boolean' { - match(input,91,FOLLOW_91_in_identifierOrKeyword377); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,91,FOLLOW_91_in_identifierOrKeyword377); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "Boolean"; } @@ -1017,8 +1070,8 @@ public class ATL_ANTLR3Parser extends Parser { case 51 : // ATL_ANTLR3.g:80:1396: 'String' { - match(input,92,FOLLOW_92_in_identifierOrKeyword382); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,92,FOLLOW_92_in_identifierOrKeyword382); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "String"; } @@ -1027,8 +1080,8 @@ public class ATL_ANTLR3Parser extends Parser { case 52 : // ATL_ANTLR3.g:80:1424: 'Collection' { - match(input,93,FOLLOW_93_in_identifierOrKeyword387); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,93,FOLLOW_93_in_identifierOrKeyword387); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "Collection"; } @@ -1037,8 +1090,8 @@ public class ATL_ANTLR3Parser extends Parser { case 53 : // ATL_ANTLR3.g:80:1460: 'not' { - match(input,94,FOLLOW_94_in_identifierOrKeyword392); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,94,FOLLOW_94_in_identifierOrKeyword392); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "not"; } @@ -1047,8 +1100,8 @@ public class ATL_ANTLR3Parser extends Parser { case 54 : // ATL_ANTLR3.g:80:1482: 'div' { - match(input,95,FOLLOW_95_in_identifierOrKeyword397); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,95,FOLLOW_95_in_identifierOrKeyword397); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "div"; } @@ -1057,8 +1110,8 @@ public class ATL_ANTLR3Parser extends Parser { case 55 : // ATL_ANTLR3.g:80:1504: 'mod' { - match(input,96,FOLLOW_96_in_identifierOrKeyword402); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,96,FOLLOW_96_in_identifierOrKeyword402); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "mod"; } @@ -1067,8 +1120,8 @@ public class ATL_ANTLR3Parser extends Parser { case 56 : // ATL_ANTLR3.g:80:1526: 'and' { - match(input,97,FOLLOW_97_in_identifierOrKeyword407); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,97,FOLLOW_97_in_identifierOrKeyword407); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "and"; } @@ -1077,8 +1130,8 @@ public class ATL_ANTLR3Parser extends Parser { case 57 : // ATL_ANTLR3.g:80:1548: 'or' { - match(input,98,FOLLOW_98_in_identifierOrKeyword412); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,98,FOLLOW_98_in_identifierOrKeyword412); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "or"; } @@ -1087,8 +1140,8 @@ public class ATL_ANTLR3Parser extends Parser { case 58 : // ATL_ANTLR3.g:80:1568: 'xor' { - match(input,99,FOLLOW_99_in_identifierOrKeyword417); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,99,FOLLOW_99_in_identifierOrKeyword417); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "xor"; } @@ -1097,8 +1150,8 @@ public class ATL_ANTLR3Parser extends Parser { case 59 : // ATL_ANTLR3.g:80:1590: 'implies' { - match(input,100,FOLLOW_100_in_identifierOrKeyword422); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,100,FOLLOW_100_in_identifierOrKeyword422); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = "implies"; } @@ -1107,7 +1160,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -1124,10 +1177,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end identifierOrKeyword + // $ANTLR end "identifierOrKeyword" - // $ANTLR start stringSymbol + // $ANTLR start "stringSymbol" // ATL_ANTLR3.g:87:1: stringSymbol returns [Object ret2] : ast= STRING ; public final Object stringSymbol() throws RecognitionException { Object ret2 = null; @@ -1139,12 +1192,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:88:2: (ast= STRING ) // ATL_ANTLR3.g:88:4: ast= STRING { - ast=(Token)input.LT(1); - match(input,STRING,FOLLOW_STRING_in_stringSymbol457); if (failed) return ret2; - if ( backtracking==0 ) { + ast=(Token)match(input,STRING,FOLLOW_STRING_in_stringSymbol457); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = ei.unescapeString(ast.getText(), 1); ei.setToken((Object)ast); } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -1161,10 +1213,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end stringSymbol + // $ANTLR end "stringSymbol" - // $ANTLR start integerSymbol + // $ANTLR start "integerSymbol" // ATL_ANTLR3.g:95:1: integerSymbol returns [Object ret2] : ast= INT ; public final Object integerSymbol() throws RecognitionException { Object ret2 = null; @@ -1176,12 +1228,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:96:2: (ast= INT ) // ATL_ANTLR3.g:96:4: ast= INT { - ast=(Token)input.LT(1); - match(input,INT,FOLLOW_INT_in_integerSymbol491); if (failed) return ret2; - if ( backtracking==0 ) { + ast=(Token)match(input,INT,FOLLOW_INT_in_integerSymbol491); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = Integer.valueOf(ast.getText()); ei.setToken((Object)ast); } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -1198,10 +1249,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end integerSymbol + // $ANTLR end "integerSymbol" - // $ANTLR start floatSymbol + // $ANTLR start "floatSymbol" // ATL_ANTLR3.g:103:1: floatSymbol returns [Object ret2] : ast= FLOAT ; public final Object floatSymbol() throws RecognitionException { Object ret2 = null; @@ -1213,12 +1264,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:104:2: (ast= FLOAT ) // ATL_ANTLR3.g:104:4: ast= FLOAT { - ast=(Token)input.LT(1); - match(input,FLOAT,FOLLOW_FLOAT_in_floatSymbol525); if (failed) return ret2; - if ( backtracking==0 ) { + ast=(Token)match(input,FLOAT,FOLLOW_FLOAT_in_floatSymbol525); if (state.failed) return ret2; + if ( state.backtracking==0 ) { ret = Double.valueOf(ast.getText()); ei.setToken((Object)ast); } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -1235,10 +1285,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end floatSymbol + // $ANTLR end "floatSymbol" - // $ANTLR start unit + // $ANTLR start "unit" // ATL_ANTLR3.g:111:1: unit returns [Object ret2] : ( (ret= module | ret= library | ret= query ) ) ; public final Object unit() throws RecognitionException { Object ret2 = null; @@ -1272,9 +1322,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("112:5: (ret= module | ret= library | ret= query )", 2, 0, input); + new NoViableAltException("", 2, 0, input); throw nvae; } @@ -1285,8 +1335,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_module_in_unit561); ret=module(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -1295,8 +1346,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_library_in_unit566); ret=library(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -1305,8 +1357,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_query_in_unit571); ret=query(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -1316,7 +1369,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -1334,10 +1387,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end unit + // $ANTLR end "unit" - // $ANTLR start module + // $ANTLR start "module" // ATL_ANTLR3.g:120:1: module returns [Object ret2] : ( 'module' temp= identifier SEMI 'create' ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) ( ( 'refining' ) | ( 'from' ) ) ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= moduleElement ( (temp= moduleElement ) )* ) )? ) ) ) ; public final Object module() throws RecognitionException { Object ret2 = null; @@ -1345,7 +1398,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("Module", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Module", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:121:2: ( ( 'module' temp= identifier SEMI 'create' ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) ( ( 'refining' ) | ( 'from' ) ) ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= moduleElement ( (temp= moduleElement ) )* ) )? ) ) ) ) // ATL_ANTLR3.g:121:4: ( 'module' temp= identifier SEMI 'create' ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) ( ( 'refining' ) | ( 'from' ) ) ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= moduleElement ( (temp= moduleElement ) )* ) )? ) ) ) @@ -1353,16 +1406,17 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:121:4: ( 'module' temp= identifier SEMI 'create' ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) ( ( 'refining' ) | ( 'from' ) ) ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= moduleElement ( (temp= moduleElement ) )* ) )? ) ) ) // ATL_ANTLR3.g:121:5: 'module' temp= identifier SEMI 'create' ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) ( ( 'refining' ) | ( 'from' ) ) ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= moduleElement ( (temp= moduleElement ) )* ) )? ) ) { - match(input,43,FOLLOW_43_in_module604); if (failed) return ret2; + match(input,43,FOLLOW_43_in_module604); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_module608); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,SEMI,FOLLOW_SEMI_in_module612); if (failed) return ret2; - match(input,44,FOLLOW_44_in_module614); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_module612); if (state.failed) return ret2; + match(input,44,FOLLOW_44_in_module614); if (state.failed) return ret2; // ATL_ANTLR3.g:121:73: ( (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) ) // ATL_ANTLR3.g:121:74: (temp= oclModel ( ( ( COMA ) temp= oclModel ) )* ) { @@ -1371,9 +1425,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclModel_in_module620); temp=oclModel(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "outModels", temp); } // ATL_ANTLR3.g:121:123: ( ( ( COMA ) temp= oclModel ) )* @@ -1397,15 +1452,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:121:125: ( COMA ) // ATL_ANTLR3.g:121:126: COMA { - match(input,COMA,FOLLOW_COMA_in_module627); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_module627); if (state.failed) return ret2; } pushFollow(FOLLOW_oclModel_in_module632); temp=oclModel(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "outModels", temp); } @@ -1437,9 +1493,9 @@ public class ATL_ANTLR3Parser extends Parser { alt4=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("121:185: ( ( 'refining' ) | ( 'from' ) )", 4, 0, input); + new NoViableAltException("", 4, 0, input); throw nvae; } @@ -1450,11 +1506,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:121:186: ( 'refining' ) // ATL_ANTLR3.g:121:187: 'refining' { - match(input,45,FOLLOW_45_in_module643); if (failed) return ret2; + match(input,45,FOLLOW_45_in_module643); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isRefining", java.lang.Boolean.TRUE); } @@ -1466,11 +1522,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:121:253: ( 'from' ) // ATL_ANTLR3.g:121:254: 'from' { - match(input,46,FOLLOW_46_in_module650); if (failed) return ret2; + match(input,46,FOLLOW_46_in_module650); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isRefining", java.lang.Boolean.FALSE); } @@ -1487,9 +1543,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclModel_in_module660); temp=oclModel(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "inModels", temp); } // ATL_ANTLR3.g:121:366: ( ( ( COMA ) temp= oclModel ) )* @@ -1513,15 +1570,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:121:368: ( COMA ) // ATL_ANTLR3.g:121:369: COMA { - match(input,COMA,FOLLOW_COMA_in_module667); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_module667); if (state.failed) return ret2; } pushFollow(FOLLOW_oclModel_in_module672); temp=oclModel(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "inModels", temp); } @@ -1542,7 +1600,7 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,SEMI,FOLLOW_SEMI_in_module681); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_module681); if (state.failed) return ret2; // ATL_ANTLR3.g:121:432: ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= moduleElement ( (temp= moduleElement ) )* ) )? ) ) // ATL_ANTLR3.g:121:433: ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= moduleElement ( (temp= moduleElement ) )* ) )? ) { @@ -1565,9 +1623,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_libraryRef_in_module689); temp=libraryRef(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "libraries", temp); } // ATL_ANTLR3.g:121:486: ( (temp= libraryRef ) )* @@ -1590,9 +1649,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_libraryRef_in_module697); temp=libraryRef(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "libraries", temp); } @@ -1632,9 +1692,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_moduleElement_in_module711); temp=moduleElement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } // ATL_ANTLR3.g:121:598: ( (temp= moduleElement ) )* @@ -1657,9 +1718,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_moduleElement_in_module719); temp=moduleElement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } @@ -1692,7 +1754,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -1712,10 +1774,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end module + // $ANTLR end "module" - // $ANTLR start library + // $ANTLR start "library" // ATL_ANTLR3.g:131:1: library returns [Object ret2] : ( 'library' temp= identifier SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) ) ; public final Object library() throws RecognitionException { Object ret2 = null; @@ -1723,7 +1785,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("Library", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Library", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:132:2: ( ( 'library' temp= identifier SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) ) ) // ATL_ANTLR3.g:132:4: ( 'library' temp= identifier SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) ) @@ -1731,15 +1793,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:132:4: ( 'library' temp= identifier SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) ) // ATL_ANTLR3.g:132:5: 'library' temp= identifier SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) { - match(input,47,FOLLOW_47_in_library761); if (failed) return ret2; + match(input,47,FOLLOW_47_in_library761); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_library765); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,SEMI,FOLLOW_SEMI_in_library769); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_library769); if (state.failed) return ret2; // ATL_ANTLR3.g:132:65: ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) // ATL_ANTLR3.g:132:66: ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) { @@ -1762,9 +1825,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_libraryRef_in_library777); temp=libraryRef(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "libraries", temp); } // ATL_ANTLR3.g:132:119: ( (temp= libraryRef ) )* @@ -1787,9 +1851,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_libraryRef_in_library785); temp=libraryRef(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "libraries", temp); } @@ -1829,9 +1894,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_helper_in_library799); temp=helper(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "helpers", temp); } // ATL_ANTLR3.g:132:223: ( (temp= helper ) )* @@ -1854,9 +1920,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_helper_in_library807); temp=helper(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "helpers", temp); } @@ -1889,7 +1956,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -1909,10 +1976,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end library + // $ANTLR end "library" - // $ANTLR start query + // $ANTLR start "query" // ATL_ANTLR3.g:142:1: query returns [Object ret2] : ( 'query' temp= identifier EQ temp= oclExpression SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) ) ; public final Object query() throws RecognitionException { Object ret2 = null; @@ -1920,7 +1987,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("Query", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Query", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:143:2: ( ( 'query' temp= identifier EQ temp= oclExpression SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) ) ) // ATL_ANTLR3.g:143:4: ( 'query' temp= identifier EQ temp= oclExpression SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) ) @@ -1928,23 +1995,25 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:143:4: ( 'query' temp= identifier EQ temp= oclExpression SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) ) // ATL_ANTLR3.g:143:5: 'query' temp= identifier EQ temp= oclExpression SEMI ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) { - match(input,48,FOLLOW_48_in_query849); if (failed) return ret2; + match(input,48,FOLLOW_48_in_query849); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_query853); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,EQ,FOLLOW_EQ_in_query857); if (failed) return ret2; + match(input,EQ,FOLLOW_EQ_in_query857); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_query861); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "body", temp); } - match(input,SEMI,FOLLOW_SEMI_in_query865); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_query865); if (state.failed) return ret2; // ATL_ANTLR3.g:143:114: ( ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) ) // ATL_ANTLR3.g:143:115: ( ( (temp= libraryRef ( (temp= libraryRef ) )* ) )? ( (temp= helper ( (temp= helper ) )* ) )? ) { @@ -1967,9 +2036,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_libraryRef_in_query873); temp=libraryRef(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "libraries", temp); } // ATL_ANTLR3.g:143:168: ( (temp= libraryRef ) )* @@ -1992,9 +2062,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_libraryRef_in_query881); temp=libraryRef(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "libraries", temp); } @@ -2034,9 +2105,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_helper_in_query895); temp=helper(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "helpers", temp); } // ATL_ANTLR3.g:143:272: ( (temp= helper ) )* @@ -2059,9 +2131,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_helper_in_query903); temp=helper(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "helpers", temp); } @@ -2094,7 +2167,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -2114,10 +2187,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end query + // $ANTLR end "query" - // $ANTLR start libraryRef + // $ANTLR start "libraryRef" // ATL_ANTLR3.g:153:1: libraryRef returns [Object ret2] : ( 'uses' temp= identifier SEMI ) ; public final Object libraryRef() throws RecognitionException { Object ret2 = null; @@ -2125,7 +2198,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("LibraryRef", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("LibraryRef", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:154:2: ( ( 'uses' temp= identifier SEMI ) ) // ATL_ANTLR3.g:154:4: ( 'uses' temp= identifier SEMI ) @@ -2133,19 +2206,20 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:154:4: ( 'uses' temp= identifier SEMI ) // ATL_ANTLR3.g:154:5: 'uses' temp= identifier SEMI { - match(input,49,FOLLOW_49_in_libraryRef945); if (failed) return ret2; + match(input,49,FOLLOW_49_in_libraryRef945); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_libraryRef949); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,SEMI,FOLLOW_SEMI_in_libraryRef953); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_libraryRef953); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -2165,10 +2239,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end libraryRef + // $ANTLR end "libraryRef" - // $ANTLR start moduleElement + // $ANTLR start "moduleElement" // ATL_ANTLR3.g:164:1: moduleElement returns [Object ret2] : ( (ret= helper | ret= rule ) ) ; public final Object moduleElement() throws RecognitionException { Object ret2 = null; @@ -2194,9 +2268,9 @@ public class ATL_ANTLR3Parser extends Parser { alt18=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("165:5: (ret= helper | ret= rule )", 18, 0, input); + new NoViableAltException("", 18, 0, input); throw nvae; } @@ -2206,8 +2280,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_helper_in_moduleElement988); ret=helper(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -2216,8 +2291,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_rule_in_moduleElement993); ret=rule(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -2227,7 +2303,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -2245,10 +2321,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end moduleElement + // $ANTLR end "moduleElement" - // $ANTLR start helper + // $ANTLR start "helper" // ATL_ANTLR3.g:173:1: helper returns [Object ret2] : ( 'helper' temp= oclFeatureDefinition SEMI ) ; public final Object helper() throws RecognitionException { Object ret2 = null; @@ -2256,7 +2332,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("Helper", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Helper", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:174:2: ( ( 'helper' temp= oclFeatureDefinition SEMI ) ) // ATL_ANTLR3.g:174:4: ( 'helper' temp= oclFeatureDefinition SEMI ) @@ -2264,19 +2340,20 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:174:4: ( 'helper' temp= oclFeatureDefinition SEMI ) // ATL_ANTLR3.g:174:5: 'helper' temp= oclFeatureDefinition SEMI { - match(input,50,FOLLOW_50_in_helper1026); if (failed) return ret2; + match(input,50,FOLLOW_50_in_helper1026); if (state.failed) return ret2; pushFollow(FOLLOW_oclFeatureDefinition_in_helper1030); temp=oclFeatureDefinition(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "definition", temp); } - match(input,SEMI,FOLLOW_SEMI_in_helper1034); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_helper1034); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -2296,10 +2373,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end helper + // $ANTLR end "helper" - // $ANTLR start oclFeatureDefinition + // $ANTLR start "oclFeatureDefinition" // ATL_ANTLR3.g:184:1: oclFeatureDefinition returns [Object ret2] : ( ( (temp= oclContextDefinition ) | () ) 'def' COLON temp= oclFeature ) ; public final Object oclFeatureDefinition() throws RecognitionException { Object ret2 = null; @@ -2307,7 +2384,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("OclFeatureDefinition", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OclFeatureDefinition", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:185:2: ( ( ( (temp= oclContextDefinition ) | () ) 'def' COLON temp= oclFeature ) ) // ATL_ANTLR3.g:185:4: ( ( (temp= oclContextDefinition ) | () ) 'def' COLON temp= oclFeature ) @@ -2326,9 +2403,9 @@ public class ATL_ANTLR3Parser extends Parser { alt19=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("185:5: ( (temp= oclContextDefinition ) | () )", 19, 0, input); + new NoViableAltException("", 19, 0, input); throw nvae; } @@ -2341,15 +2418,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclContextDefinition_in_oclFeatureDefinition1070); temp=oclContextDefinition(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "context_", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -2362,7 +2440,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -2370,19 +2448,20 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,51,FOLLOW_51_in_oclFeatureDefinition1084); if (failed) return ret2; - match(input,COLON,FOLLOW_COLON_in_oclFeatureDefinition1086); if (failed) return ret2; + match(input,51,FOLLOW_51_in_oclFeatureDefinition1084); if (state.failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_oclFeatureDefinition1086); if (state.failed) return ret2; pushFollow(FOLLOW_oclFeature_in_oclFeatureDefinition1090); temp=oclFeature(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "feature", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -2402,10 +2481,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclFeatureDefinition + // $ANTLR end "oclFeatureDefinition" - // $ANTLR start oclContextDefinition + // $ANTLR start "oclContextDefinition" // ATL_ANTLR3.g:195:1: oclContextDefinition returns [Object ret2] : ( 'context' temp= oclType ) ; public final Object oclContextDefinition() throws RecognitionException { Object ret2 = null; @@ -2413,7 +2492,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("OclContextDefinition", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OclContextDefinition", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:196:2: ( ( 'context' temp= oclType ) ) // ATL_ANTLR3.g:196:4: ( 'context' temp= oclType ) @@ -2421,18 +2500,19 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:196:4: ( 'context' temp= oclType ) // ATL_ANTLR3.g:196:5: 'context' temp= oclType { - match(input,52,FOLLOW_52_in_oclContextDefinition1124); if (failed) return ret2; + match(input,52,FOLLOW_52_in_oclContextDefinition1124); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_oclContextDefinition1128); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "context_", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -2452,10 +2532,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclContextDefinition + // $ANTLR end "oclContextDefinition" - // $ANTLR start oclFeature + // $ANTLR start "oclFeature" // ATL_ANTLR3.g:206:1: oclFeature returns [Object ret2] : ( (ret= operation | ret= attribute ) ) ; public final Object oclFeature() throws RecognitionException { Object ret2 = null; @@ -2477,24 +2557,24 @@ public class ATL_ANTLR3Parser extends Parser { if ( (LA20_0==NAME) ) { int LA20_1 = input.LA(2); - if ( (LA20_1==LPAREN) ) { - alt20=1; - } - else if ( (LA20_1==COLON) ) { + if ( (LA20_1==COLON) ) { alt20=2; } + else if ( (LA20_1==LPAREN) ) { + alt20=1; + } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("207:5: (ret= operation | ret= attribute )", 20, 1, input); + new NoViableAltException("", 20, 1, input); throw nvae; } } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("207:5: (ret= operation | ret= attribute )", 20, 0, input); + new NoViableAltException("", 20, 0, input); throw nvae; } @@ -2504,8 +2584,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_operation_in_oclFeature1165); ret=operation(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -2514,8 +2595,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_attribute_in_oclFeature1170); ret=attribute(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -2525,7 +2607,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -2543,10 +2625,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclFeature + // $ANTLR end "oclFeature" - // $ANTLR start operation + // $ANTLR start "operation" // ATL_ANTLR3.g:215:1: operation returns [Object ret2] : (temp= identifier LPAREN ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) )? RPAREN COLON temp= oclType EQ ( (temp= oclExpression ) ) ) ; public final Object operation() throws RecognitionException { Object ret2 = null; @@ -2554,7 +2636,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("Operation", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Operation", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:216:2: ( (temp= identifier LPAREN ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) )? RPAREN COLON temp= oclType EQ ( (temp= oclExpression ) ) ) ) // ATL_ANTLR3.g:216:4: (temp= identifier LPAREN ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) )? RPAREN COLON temp= oclType EQ ( (temp= oclExpression ) ) ) @@ -2564,12 +2646,13 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_operation1205); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,LPAREN,FOLLOW_LPAREN_in_operation1209); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_operation1209); if (state.failed) return ret2; // ATL_ANTLR3.g:216:57: ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) )? int alt22=2; int LA22_0 = input.LA(1); @@ -2586,9 +2669,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_parameter_in_operation1215); temp=parameter(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "parameters", temp); } // ATL_ANTLR3.g:216:109: ( ( ( COMA ) temp= parameter ) )* @@ -2612,15 +2696,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:216:111: ( COMA ) // ATL_ANTLR3.g:216:112: COMA { - match(input,COMA,FOLLOW_COMA_in_operation1222); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_operation1222); if (state.failed) return ret2; } pushFollow(FOLLOW_parameter_in_operation1227); temp=parameter(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "parameters", temp); } @@ -2644,16 +2729,17 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_operation1237); if (failed) return ret2; - match(input,COLON,FOLLOW_COLON_in_operation1239); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_operation1237); if (state.failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_operation1239); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_operation1243); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "returnType", temp); } - match(input,EQ,FOLLOW_EQ_in_operation1247); if (failed) return ret2; + match(input,EQ,FOLLOW_EQ_in_operation1247); if (state.failed) return ret2; // ATL_ANTLR3.g:216:238: ( (temp= oclExpression ) ) // ATL_ANTLR3.g:216:239: (temp= oclExpression ) { @@ -2662,9 +2748,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_operation1253); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "body", temp); } @@ -2676,7 +2763,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -2696,10 +2783,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end operation + // $ANTLR end "operation" - // $ANTLR start parameter + // $ANTLR start "parameter" // ATL_ANTLR3.g:226:1: parameter returns [Object ret2] : (temp= identifier COLON temp= oclType ) ; public final Object parameter() throws RecognitionException { Object ret2 = null; @@ -2707,7 +2794,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("Parameter", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Parameter", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:227:2: ( (temp= identifier COLON temp= oclType ) ) // ATL_ANTLR3.g:227:4: (temp= identifier COLON temp= oclType ) @@ -2717,23 +2804,25 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_parameter1291); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "varName", temp); } - match(input,COLON,FOLLOW_COLON_in_parameter1295); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_parameter1295); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_parameter1299); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "type", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -2753,10 +2842,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end parameter + // $ANTLR end "parameter" - // $ANTLR start attribute + // $ANTLR start "attribute" // ATL_ANTLR3.g:237:1: attribute returns [Object ret2] : (temp= identifier COLON temp= oclType EQ ( (temp= oclExpression ) ) ) ; public final Object attribute() throws RecognitionException { Object ret2 = null; @@ -2764,7 +2853,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("Attribute", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Attribute", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:238:2: ( (temp= identifier COLON temp= oclType EQ ( (temp= oclExpression ) ) ) ) // ATL_ANTLR3.g:238:4: (temp= identifier COLON temp= oclType EQ ( (temp= oclExpression ) ) ) @@ -2774,20 +2863,22 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_attribute1335); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,COLON,FOLLOW_COLON_in_attribute1339); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_attribute1339); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_attribute1343); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "type", temp); } - match(input,EQ,FOLLOW_EQ_in_attribute1347); if (failed) return ret2; + match(input,EQ,FOLLOW_EQ_in_attribute1347); if (state.failed) return ret2; // ATL_ANTLR3.g:238:101: ( (temp= oclExpression ) ) // ATL_ANTLR3.g:238:102: (temp= oclExpression ) { @@ -2796,9 +2887,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_attribute1353); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "initExpression", temp); } @@ -2810,7 +2902,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -2830,10 +2922,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end attribute + // $ANTLR end "attribute" - // $ANTLR start rule + // $ANTLR start "rule" // ATL_ANTLR3.g:248:1: rule returns [Object ret2] : ( (ret= calledRule | ret= matchedRule ) ) ; public final Object rule() throws RecognitionException { Object ret2 = null; @@ -2871,17 +2963,17 @@ public class ATL_ANTLR3Parser extends Parser { alt23=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("249:5: (ret= calledRule | ret= matchedRule )", 23, 4, input); + new NoViableAltException("", 23, 4, input); throw nvae; } } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("249:5: (ret= calledRule | ret= matchedRule )", 23, 2, input); + new NoViableAltException("", 23, 2, input); throw nvae; } @@ -2897,9 +2989,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("249:5: (ret= calledRule | ret= matchedRule )", 23, 0, input); + new NoViableAltException("", 23, 0, input); throw nvae; } @@ -2910,8 +3002,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_calledRule_in_rule1392); ret=calledRule(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -2920,8 +3013,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_matchedRule_in_rule1397); ret=matchedRule(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -2931,7 +3025,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -2949,10 +3043,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end rule + // $ANTLR end "rule" - // $ANTLR start matchedRule + // $ANTLR start "matchedRule" // ATL_ANTLR3.g:257:1: matchedRule returns [Object ret2] : ( (ret= lazyMatchedRule | ret= matchedRule_abstractContents ) ) ; public final Object matchedRule() throws RecognitionException { Object ret2 = null; @@ -2978,9 +3072,9 @@ public class ATL_ANTLR3Parser extends Parser { alt24=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("258:5: (ret= lazyMatchedRule | ret= matchedRule_abstractContents )", 24, 0, input); + new NoViableAltException("", 24, 0, input); throw nvae; } @@ -2990,8 +3084,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_lazyMatchedRule_in_matchedRule1433); ret=lazyMatchedRule(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -3000,8 +3095,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_matchedRule_abstractContents_in_matchedRule1438); ret=matchedRule_abstractContents(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -3011,7 +3107,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, true); ret2=ret; @@ -3029,10 +3125,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end matchedRule + // $ANTLR end "matchedRule" - // $ANTLR start lazyMatchedRule + // $ANTLR start "lazyMatchedRule" // ATL_ANTLR3.g:266:1: lazyMatchedRule returns [Object ret2] : ( ( ( 'unique' ) | () ) 'lazy' ( ( 'abstract' ) | () ) ( ( 'refining' ) | () ) 'rule' temp= identifier ( ( 'extends' temp= identifier ) | () ) LCURLY ( (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) RCURLY ) ; public final Object lazyMatchedRule() throws RecognitionException { Object ret2 = null; @@ -3040,7 +3136,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("LazyMatchedRule", true, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("LazyMatchedRule", true, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:267:2: ( ( ( ( 'unique' ) | () ) 'lazy' ( ( 'abstract' ) | () ) ( ( 'refining' ) | () ) 'rule' temp= identifier ( ( 'extends' temp= identifier ) | () ) LCURLY ( (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) RCURLY ) ) // ATL_ANTLR3.g:267:4: ( ( ( 'unique' ) | () ) 'lazy' ( ( 'abstract' ) | () ) ( ( 'refining' ) | () ) 'rule' temp= identifier ( ( 'extends' temp= identifier ) | () ) LCURLY ( (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) RCURLY ) @@ -3059,9 +3155,9 @@ public class ATL_ANTLR3Parser extends Parser { alt25=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("267:5: ( ( 'unique' ) | () )", 25, 0, input); + new NoViableAltException("", 25, 0, input); throw nvae; } @@ -3072,11 +3168,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:267:6: ( 'unique' ) // ATL_ANTLR3.g:267:7: 'unique' { - match(input,58,FOLLOW_58_in_lazyMatchedRule1473); if (failed) return ret2; + match(input,58,FOLLOW_58_in_lazyMatchedRule1473); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isUnique", java.lang.Boolean.TRUE); } @@ -3090,7 +3186,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isUnique", java.lang.Boolean.FALSE); } @@ -3099,7 +3195,7 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,59,FOLLOW_59_in_lazyMatchedRule1485); if (failed) return ret2; + match(input,59,FOLLOW_59_in_lazyMatchedRule1485); if (state.failed) return ret2; // ATL_ANTLR3.g:267:132: ( ( 'abstract' ) | () ) int alt26=2; int LA26_0 = input.LA(1); @@ -3111,9 +3207,9 @@ public class ATL_ANTLR3Parser extends Parser { alt26=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("267:132: ( ( 'abstract' ) | () )", 26, 0, input); + new NoViableAltException("", 26, 0, input); throw nvae; } @@ -3124,11 +3220,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:267:133: ( 'abstract' ) // ATL_ANTLR3.g:267:134: 'abstract' { - match(input,54,FOLLOW_54_in_lazyMatchedRule1489); if (failed) return ret2; + match(input,54,FOLLOW_54_in_lazyMatchedRule1489); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isAbstract", java.lang.Boolean.TRUE); } @@ -3142,7 +3238,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isAbstract", java.lang.Boolean.FALSE); } @@ -3162,9 +3258,9 @@ public class ATL_ANTLR3Parser extends Parser { alt27=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("267:258: ( ( 'refining' ) | () )", 27, 0, input); + new NoViableAltException("", 27, 0, input); throw nvae; } @@ -3175,11 +3271,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:267:259: ( 'refining' ) // ATL_ANTLR3.g:267:260: 'refining' { - match(input,45,FOLLOW_45_in_lazyMatchedRule1503); if (failed) return ret2; + match(input,45,FOLLOW_45_in_lazyMatchedRule1503); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isRefining", java.lang.Boolean.TRUE); } @@ -3193,7 +3289,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isRefining", java.lang.Boolean.FALSE); } @@ -3202,12 +3298,13 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,55,FOLLOW_55_in_lazyMatchedRule1515); if (failed) return ret2; + match(input,55,FOLLOW_55_in_lazyMatchedRule1515); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_lazyMatchedRule1519); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } // ATL_ANTLR3.g:267:436: ( ( 'extends' temp= identifier ) | () ) @@ -3221,9 +3318,9 @@ public class ATL_ANTLR3Parser extends Parser { alt28=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("267:436: ( ( 'extends' temp= identifier ) | () )", 28, 0, input); + new NoViableAltException("", 28, 0, input); throw nvae; } @@ -3234,18 +3331,19 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:267:437: ( 'extends' temp= identifier ) // ATL_ANTLR3.g:267:438: 'extends' temp= identifier { - match(input,56,FOLLOW_56_in_lazyMatchedRule1525); if (failed) return ret2; + match(input,56,FOLLOW_56_in_lazyMatchedRule1525); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_lazyMatchedRule1529); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "superRule", "MatchedRule", "name", temp, null, "never", null, true, null); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3258,7 +3356,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3266,7 +3364,7 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,LCURLY,FOLLOW_LCURLY_in_lazyMatchedRule1543); if (failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_lazyMatchedRule1543); if (state.failed) return ret2; // ATL_ANTLR3.g:267:576: ( (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) // ATL_ANTLR3.g:267:577: (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) { @@ -3275,9 +3373,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_inPattern_in_lazyMatchedRule1549); temp=inPattern(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "inPattern", temp); } // ATL_ANTLR3.g:267:627: ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) @@ -3291,9 +3390,9 @@ public class ATL_ANTLR3Parser extends Parser { alt31=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("267:627: ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () )", 31, 0, input); + new NoViableAltException("", 31, 0, input); throw nvae; } @@ -3304,8 +3403,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:267:628: ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) // ATL_ANTLR3.g:267:629: 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY { - match(input,57,FOLLOW_57_in_lazyMatchedRule1555); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_lazyMatchedRule1557); if (failed) return ret2; + match(input,57,FOLLOW_57_in_lazyMatchedRule1555); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_lazyMatchedRule1557); if (state.failed) return ret2; // ATL_ANTLR3.g:267:644: ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) // ATL_ANTLR3.g:267:645: ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) { @@ -3328,9 +3427,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_ruleVariableDeclaration_in_lazyMatchedRule1565); temp=ruleVariableDeclaration(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "variables", temp); } // ATL_ANTLR3.g:267:711: ( (temp= ruleVariableDeclaration ) )* @@ -3353,9 +3453,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_ruleVariableDeclaration_in_lazyMatchedRule1573); temp=ruleVariableDeclaration(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "variables", temp); } @@ -3385,11 +3486,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_lazyMatchedRule1585); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_lazyMatchedRule1585); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3402,7 +3503,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3421,9 +3522,9 @@ public class ATL_ANTLR3Parser extends Parser { alt32=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("267:803: ( (temp= outPattern ) | () )", 32, 0, input); + new NoViableAltException("", 32, 0, input); throw nvae; } @@ -3436,15 +3537,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_outPattern_in_lazyMatchedRule1601); temp=outPattern(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "outPattern", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3457,7 +3559,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3476,9 +3578,9 @@ public class ATL_ANTLR3Parser extends Parser { alt33=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("267:868: ( (temp= actionBlock ) | () )", 33, 0, input); + new NoViableAltException("", 33, 0, input); throw nvae; } @@ -3491,15 +3593,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_actionBlock_in_lazyMatchedRule1619); temp=actionBlock(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "actionBlock", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3512,7 +3615,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3526,11 +3629,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_lazyMatchedRule1635); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_lazyMatchedRule1635); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -3550,10 +3653,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end lazyMatchedRule + // $ANTLR end "lazyMatchedRule" - // $ANTLR start ruleVariableDeclaration + // $ANTLR start "ruleVariableDeclaration" // ATL_ANTLR3.g:277:1: ruleVariableDeclaration returns [Object ret2] : (temp= identifier COLON temp= oclType EQ temp= oclExpression SEMI ) ; public final Object ruleVariableDeclaration() throws RecognitionException { Object ret2 = null; @@ -3561,7 +3664,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("RuleVariableDeclaration", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("RuleVariableDeclaration", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:278:2: ( (temp= identifier COLON temp= oclType EQ temp= oclExpression SEMI ) ) // ATL_ANTLR3.g:278:4: (temp= identifier COLON temp= oclType EQ temp= oclExpression SEMI ) @@ -3571,32 +3674,35 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_ruleVariableDeclaration1669); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "varName", temp); } - match(input,COLON,FOLLOW_COLON_in_ruleVariableDeclaration1673); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_ruleVariableDeclaration1673); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_ruleVariableDeclaration1677); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "type", temp); } - match(input,EQ,FOLLOW_EQ_in_ruleVariableDeclaration1681); if (failed) return ret2; + match(input,EQ,FOLLOW_EQ_in_ruleVariableDeclaration1681); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_ruleVariableDeclaration1685); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "initExpression", temp); } - match(input,SEMI,FOLLOW_SEMI_in_ruleVariableDeclaration1689); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_ruleVariableDeclaration1689); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -3616,10 +3722,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end ruleVariableDeclaration + // $ANTLR end "ruleVariableDeclaration" - // $ANTLR start calledRule + // $ANTLR start "calledRule" // ATL_ANTLR3.g:288:1: calledRule returns [Object ret2] : ( ( ( 'entrypoint' ) | () ) ( ( 'endpoint' ) | () ) 'rule' temp= identifier LPAREN ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) )? RPAREN LCURLY ( ( ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) RCURLY ) ; public final Object calledRule() throws RecognitionException { Object ret2 = null; @@ -3627,7 +3733,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("CalledRule", true, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("CalledRule", true, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:289:2: ( ( ( ( 'entrypoint' ) | () ) ( ( 'endpoint' ) | () ) 'rule' temp= identifier LPAREN ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) )? RPAREN LCURLY ( ( ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) RCURLY ) ) // ATL_ANTLR3.g:289:4: ( ( ( 'entrypoint' ) | () ) ( ( 'endpoint' ) | () ) 'rule' temp= identifier LPAREN ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) )? RPAREN LCURLY ( ( ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) RCURLY ) @@ -3646,9 +3752,9 @@ public class ATL_ANTLR3Parser extends Parser { alt34=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("289:5: ( ( 'entrypoint' ) | () )", 34, 0, input); + new NoViableAltException("", 34, 0, input); throw nvae; } @@ -3659,11 +3765,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:289:6: ( 'entrypoint' ) // ATL_ANTLR3.g:289:7: 'entrypoint' { - match(input,60,FOLLOW_60_in_calledRule1723); if (failed) return ret2; + match(input,60,FOLLOW_60_in_calledRule1723); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isEntrypoint", java.lang.Boolean.TRUE); } @@ -3677,7 +3783,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isEntrypoint", java.lang.Boolean.FALSE); } @@ -3697,9 +3803,9 @@ public class ATL_ANTLR3Parser extends Parser { alt35=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("289:137: ( ( 'endpoint' ) | () )", 35, 0, input); + new NoViableAltException("", 35, 0, input); throw nvae; } @@ -3710,11 +3816,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:289:138: ( 'endpoint' ) // ATL_ANTLR3.g:289:139: 'endpoint' { - match(input,61,FOLLOW_61_in_calledRule1737); if (failed) return ret2; + match(input,61,FOLLOW_61_in_calledRule1737); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isEndpoint", java.lang.Boolean.TRUE); } @@ -3728,7 +3834,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isEndpoint", java.lang.Boolean.FALSE); } @@ -3737,15 +3843,16 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,55,FOLLOW_55_in_calledRule1749); if (failed) return ret2; + match(input,55,FOLLOW_55_in_calledRule1749); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_calledRule1753); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,LPAREN,FOLLOW_LPAREN_in_calledRule1757); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_calledRule1757); if (state.failed) return ret2; // ATL_ANTLR3.g:289:322: ( (temp= parameter ( ( ( COMA ) temp= parameter ) )* ) )? int alt37=2; int LA37_0 = input.LA(1); @@ -3762,9 +3869,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_parameter_in_calledRule1763); temp=parameter(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "parameters", temp); } // ATL_ANTLR3.g:289:374: ( ( ( COMA ) temp= parameter ) )* @@ -3788,15 +3896,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:289:376: ( COMA ) // ATL_ANTLR3.g:289:377: COMA { - match(input,COMA,FOLLOW_COMA_in_calledRule1770); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_calledRule1770); if (state.failed) return ret2; } pushFollow(FOLLOW_parameter_in_calledRule1775); temp=parameter(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "parameters", temp); } @@ -3820,8 +3929,8 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_calledRule1785); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_calledRule1787); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_calledRule1785); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_calledRule1787); if (state.failed) return ret2; // ATL_ANTLR3.g:289:453: ( ( ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) // ATL_ANTLR3.g:289:454: ( ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) { @@ -3839,9 +3948,9 @@ public class ATL_ANTLR3Parser extends Parser { alt40=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("289:455: ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () )", 40, 0, input); + new NoViableAltException("", 40, 0, input); throw nvae; } @@ -3852,8 +3961,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:289:456: ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) // ATL_ANTLR3.g:289:457: 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY { - match(input,57,FOLLOW_57_in_calledRule1793); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_calledRule1795); if (failed) return ret2; + match(input,57,FOLLOW_57_in_calledRule1793); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_calledRule1795); if (state.failed) return ret2; // ATL_ANTLR3.g:289:472: ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) // ATL_ANTLR3.g:289:473: ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) { @@ -3876,9 +3985,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_ruleVariableDeclaration_in_calledRule1803); temp=ruleVariableDeclaration(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "variables", temp); } // ATL_ANTLR3.g:289:539: ( (temp= ruleVariableDeclaration ) )* @@ -3901,9 +4011,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_ruleVariableDeclaration_in_calledRule1811); temp=ruleVariableDeclaration(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "variables", temp); } @@ -3933,11 +4044,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_calledRule1823); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_calledRule1823); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3950,7 +4061,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -3969,9 +4080,9 @@ public class ATL_ANTLR3Parser extends Parser { alt41=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("289:631: ( (temp= outPattern ) | () )", 41, 0, input); + new NoViableAltException("", 41, 0, input); throw nvae; } @@ -3984,15 +4095,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_outPattern_in_calledRule1839); temp=outPattern(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "outPattern", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4005,7 +4117,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4024,9 +4136,9 @@ public class ATL_ANTLR3Parser extends Parser { alt42=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("289:696: ( (temp= actionBlock ) | () )", 42, 0, input); + new NoViableAltException("", 42, 0, input); throw nvae; } @@ -4039,15 +4151,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_actionBlock_in_calledRule1857); temp=actionBlock(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "actionBlock", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4060,7 +4173,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4074,11 +4187,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_calledRule1873); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_calledRule1873); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -4098,10 +4211,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end calledRule + // $ANTLR end "calledRule" - // $ANTLR start inPattern + // $ANTLR start "inPattern" // ATL_ANTLR3.g:299:1: inPattern returns [Object ret2] : ( 'from' ( ( ( (temp= inPatternElement ( ( ( COMA ) temp= inPatternElement ) )* ) ) ( ( LPAREN ( (temp= oclExpression ) ) RPAREN ) | () ) ) ) ) ; public final Object inPattern() throws RecognitionException { Object ret2 = null; @@ -4109,7 +4222,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("InPattern", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("InPattern", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:300:2: ( ( 'from' ( ( ( (temp= inPatternElement ( ( ( COMA ) temp= inPatternElement ) )* ) ) ( ( LPAREN ( (temp= oclExpression ) ) RPAREN ) | () ) ) ) ) ) // ATL_ANTLR3.g:300:4: ( 'from' ( ( ( (temp= inPatternElement ( ( ( COMA ) temp= inPatternElement ) )* ) ) ( ( LPAREN ( (temp= oclExpression ) ) RPAREN ) | () ) ) ) ) @@ -4117,7 +4230,7 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:300:4: ( 'from' ( ( ( (temp= inPatternElement ( ( ( COMA ) temp= inPatternElement ) )* ) ) ( ( LPAREN ( (temp= oclExpression ) ) RPAREN ) | () ) ) ) ) // ATL_ANTLR3.g:300:5: 'from' ( ( ( (temp= inPatternElement ( ( ( COMA ) temp= inPatternElement ) )* ) ) ( ( LPAREN ( (temp= oclExpression ) ) RPAREN ) | () ) ) ) { - match(input,46,FOLLOW_46_in_inPattern1905); if (failed) return ret2; + match(input,46,FOLLOW_46_in_inPattern1905); if (state.failed) return ret2; // ATL_ANTLR3.g:300:12: ( ( ( (temp= inPatternElement ( ( ( COMA ) temp= inPatternElement ) )* ) ) ( ( LPAREN ( (temp= oclExpression ) ) RPAREN ) | () ) ) ) // ATL_ANTLR3.g:300:13: ( ( (temp= inPatternElement ( ( ( COMA ) temp= inPatternElement ) )* ) ) ( ( LPAREN ( (temp= oclExpression ) ) RPAREN ) | () ) ) { @@ -4132,9 +4245,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_inPatternElement_in_inPattern1913); temp=inPatternElement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } // ATL_ANTLR3.g:300:71: ( ( ( COMA ) temp= inPatternElement ) )* @@ -4158,15 +4272,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:300:73: ( COMA ) // ATL_ANTLR3.g:300:74: COMA { - match(input,COMA,FOLLOW_COMA_in_inPattern1920); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_inPattern1920); if (state.failed) return ret2; } pushFollow(FOLLOW_inPatternElement_in_inPattern1925); temp=inPatternElement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } @@ -4198,9 +4313,9 @@ public class ATL_ANTLR3Parser extends Parser { alt44=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("300:140: ( ( LPAREN ( (temp= oclExpression ) ) RPAREN ) | () )", 44, 0, input); + new NoViableAltException("", 44, 0, input); throw nvae; } @@ -4211,7 +4326,7 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:300:141: ( LPAREN ( (temp= oclExpression ) ) RPAREN ) // ATL_ANTLR3.g:300:142: LPAREN ( (temp= oclExpression ) ) RPAREN { - match(input,LPAREN,FOLLOW_LPAREN_in_inPattern1936); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_inPattern1936); if (state.failed) return ret2; // ATL_ANTLR3.g:300:149: ( (temp= oclExpression ) ) // ATL_ANTLR3.g:300:150: (temp= oclExpression ) { @@ -4220,9 +4335,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_inPattern1942); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "filter", temp); } @@ -4231,11 +4347,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_inPattern1948); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_inPattern1948); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4248,7 +4364,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4265,7 +4381,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -4285,10 +4401,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end inPattern + // $ANTLR end "inPattern" - // $ANTLR start inPatternElement + // $ANTLR start "inPatternElement" // ATL_ANTLR3.g:310:1: inPatternElement returns [Object ret2] : (ret= simpleInPatternElement ) ; public final Object inPatternElement() throws RecognitionException { Object ret2 = null; @@ -4305,12 +4421,13 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_simpleInPatternElement_in_inPatternElement1994); ret=simpleInPatternElement(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, true); ret2=ret; @@ -4328,10 +4445,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end inPatternElement + // $ANTLR end "inPatternElement" - // $ANTLR start simpleInPatternElement + // $ANTLR start "simpleInPatternElement" // ATL_ANTLR3.g:319:1: simpleInPatternElement returns [Object ret2] : (temp= identifier COLON temp= oclType ( ( 'in' ( (temp= identifier ( ( ( COMA ) temp= identifier ) )* ) )? ) | () ) ) ; public final Object simpleInPatternElement() throws RecognitionException { Object ret2 = null; @@ -4339,7 +4456,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("SimpleInPatternElement", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SimpleInPatternElement", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:320:2: ( (temp= identifier COLON temp= oclType ( ( 'in' ( (temp= identifier ( ( ( COMA ) temp= identifier ) )* ) )? ) | () ) ) ) // ATL_ANTLR3.g:320:4: (temp= identifier COLON temp= oclType ( ( 'in' ( (temp= identifier ( ( ( COMA ) temp= identifier ) )* ) )? ) | () ) ) @@ -4349,17 +4466,19 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_simpleInPatternElement2028); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "varName", temp); } - match(input,COLON,FOLLOW_COLON_in_simpleInPatternElement2032); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_simpleInPatternElement2032); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_simpleInPatternElement2036); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "type", temp); } // ATL_ANTLR3.g:320:101: ( ( 'in' ( (temp= identifier ( ( ( COMA ) temp= identifier ) )* ) )? ) | () ) @@ -4373,9 +4492,9 @@ public class ATL_ANTLR3Parser extends Parser { alt47=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("320:101: ( ( 'in' ( (temp= identifier ( ( ( COMA ) temp= identifier ) )* ) )? ) | () )", 47, 0, input); + new NoViableAltException("", 47, 0, input); throw nvae; } @@ -4386,7 +4505,7 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:320:102: ( 'in' ( (temp= identifier ( ( ( COMA ) temp= identifier ) )* ) )? ) // ATL_ANTLR3.g:320:103: 'in' ( (temp= identifier ( ( ( COMA ) temp= identifier ) )* ) )? { - match(input,62,FOLLOW_62_in_simpleInPatternElement2042); if (failed) return ret2; + match(input,62,FOLLOW_62_in_simpleInPatternElement2042); if (state.failed) return ret2; // ATL_ANTLR3.g:320:108: ( (temp= identifier ( ( ( COMA ) temp= identifier ) )* ) )? int alt46=2; int LA46_0 = input.LA(1); @@ -4403,9 +4522,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_simpleInPatternElement2048); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "models", "OclModel", "name", temp, "#all", "never", null, false, null); } // ATL_ANTLR3.g:320:216: ( ( ( COMA ) temp= identifier ) )* @@ -4441,15 +4561,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:320:218: ( COMA ) // ATL_ANTLR3.g:320:219: COMA { - match(input,COMA,FOLLOW_COMA_in_simpleInPatternElement2055); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_simpleInPatternElement2055); if (state.failed) return ret2; } pushFollow(FOLLOW_identifier_in_simpleInPatternElement2060); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "models", "OclModel", "name", temp, "#all", "never", null, false, null); } @@ -4476,7 +4597,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4489,7 +4610,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4500,7 +4621,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -4520,10 +4641,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end simpleInPatternElement + // $ANTLR end "simpleInPatternElement" - // $ANTLR start outPattern + // $ANTLR start "outPattern" // ATL_ANTLR3.g:330:1: outPattern returns [Object ret2] : ( 'to' ( (temp= dropPattern ) | () ) ( ( ( ( ( (temp= outPatternElement ( ( ( COMA ) temp= outPatternElement ) )* ) ) ) | () ) ) ) ) ; public final Object outPattern() throws RecognitionException { Object ret2 = null; @@ -4531,7 +4652,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("OutPattern", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OutPattern", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:331:2: ( ( 'to' ( (temp= dropPattern ) | () ) ( ( ( ( ( (temp= outPatternElement ( ( ( COMA ) temp= outPatternElement ) )* ) ) ) | () ) ) ) ) ) // ATL_ANTLR3.g:331:4: ( 'to' ( (temp= dropPattern ) | () ) ( ( ( ( ( (temp= outPatternElement ( ( ( COMA ) temp= outPatternElement ) )* ) ) ) | () ) ) ) ) @@ -4539,7 +4660,7 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:331:4: ( 'to' ( (temp= dropPattern ) | () ) ( ( ( ( ( (temp= outPatternElement ( ( ( COMA ) temp= outPatternElement ) )* ) ) ) | () ) ) ) ) // ATL_ANTLR3.g:331:5: 'to' ( (temp= dropPattern ) | () ) ( ( ( ( ( (temp= outPatternElement ( ( ( COMA ) temp= outPatternElement ) )* ) ) ) | () ) ) ) { - match(input,63,FOLLOW_63_in_outPattern2110); if (failed) return ret2; + match(input,63,FOLLOW_63_in_outPattern2110); if (state.failed) return ret2; // ATL_ANTLR3.g:331:10: ( (temp= dropPattern ) | () ) int alt48=2; int LA48_0 = input.LA(1); @@ -4551,9 +4672,9 @@ public class ATL_ANTLR3Parser extends Parser { alt48=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("331:10: ( (temp= dropPattern ) | () )", 48, 0, input); + new NoViableAltException("", 48, 0, input); throw nvae; } @@ -4566,15 +4687,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_dropPattern_in_outPattern2116); temp=dropPattern(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "dropPattern", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4587,7 +4709,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4612,9 +4734,9 @@ public class ATL_ANTLR3Parser extends Parser { alt50=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("331:79: ( ( ( (temp= outPatternElement ( ( ( COMA ) temp= outPatternElement ) )* ) ) ) | () )", 50, 0, input); + new NoViableAltException("", 50, 0, input); throw nvae; } @@ -4633,9 +4755,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_outPatternElement_in_outPattern2138); temp=outPatternElement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } // ATL_ANTLR3.g:331:139: ( ( ( COMA ) temp= outPatternElement ) )* @@ -4659,15 +4782,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:331:141: ( COMA ) // ATL_ANTLR3.g:331:142: COMA { - match(input,COMA,FOLLOW_COMA_in_outPattern2145); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_outPattern2145); if (state.failed) return ret2; } pushFollow(FOLLOW_outPatternElement_in_outPattern2150); temp=outPatternElement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } @@ -4691,7 +4815,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4704,7 +4828,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4721,7 +4845,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -4741,10 +4865,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end outPattern + // $ANTLR end "outPattern" - // $ANTLR start outPatternElement + // $ANTLR start "outPatternElement" // ATL_ANTLR3.g:341:1: outPatternElement returns [Object ret2] : ( (ret= simpleOutPatternElement | ret= forEachOutPatternElement ) ) ; public final Object outPatternElement() throws RecognitionException { Object ret2 = null; @@ -4776,25 +4900,25 @@ public class ATL_ANTLR3Parser extends Parser { alt51=1; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("342:5: (ret= simpleOutPatternElement | ret= forEachOutPatternElement )", 51, 2, input); + new NoViableAltException("", 51, 2, input); throw nvae; } } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("342:5: (ret= simpleOutPatternElement | ret= forEachOutPatternElement )", 51, 1, input); + new NoViableAltException("", 51, 1, input); throw nvae; } } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("342:5: (ret= simpleOutPatternElement | ret= forEachOutPatternElement )", 51, 0, input); + new NoViableAltException("", 51, 0, input); throw nvae; } @@ -4804,8 +4928,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_simpleOutPatternElement_in_outPatternElement2204); ret=simpleOutPatternElement(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -4814,8 +4939,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_forEachOutPatternElement_in_outPatternElement2209); ret=forEachOutPatternElement(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -4825,7 +4951,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, true); ret2=ret; @@ -4843,10 +4969,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end outPatternElement + // $ANTLR end "outPatternElement" - // $ANTLR start simpleOutPatternElement + // $ANTLR start "simpleOutPatternElement" // ATL_ANTLR3.g:350:1: simpleOutPatternElement returns [Object ret2] : (temp= identifier COLON temp= oclType ( ( 'in' temp= identifier ) | () ) ( ( 'mapsTo' temp= identifier ) | () ) ( ( RARROW LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) | () ) ( ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) | () ) ) ; public final Object simpleOutPatternElement() throws RecognitionException { Object ret2 = null; @@ -4854,7 +4980,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("SimpleOutPatternElement", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SimpleOutPatternElement", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:351:2: ( (temp= identifier COLON temp= oclType ( ( 'in' temp= identifier ) | () ) ( ( 'mapsTo' temp= identifier ) | () ) ( ( RARROW LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) | () ) ( ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) | () ) ) ) // ATL_ANTLR3.g:351:4: (temp= identifier COLON temp= oclType ( ( 'in' temp= identifier ) | () ) ( ( 'mapsTo' temp= identifier ) | () ) ( ( RARROW LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) | () ) ( ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) | () ) ) @@ -4864,17 +4990,19 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_simpleOutPatternElement2244); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "varName", temp); } - match(input,COLON,FOLLOW_COLON_in_simpleOutPatternElement2248); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_simpleOutPatternElement2248); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_simpleOutPatternElement2252); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "type", temp); } // ATL_ANTLR3.g:351:101: ( ( 'in' temp= identifier ) | () ) @@ -4888,9 +5016,9 @@ public class ATL_ANTLR3Parser extends Parser { alt52=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("351:101: ( ( 'in' temp= identifier ) | () )", 52, 0, input); + new NoViableAltException("", 52, 0, input); throw nvae; } @@ -4901,18 +5029,19 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:351:102: ( 'in' temp= identifier ) // ATL_ANTLR3.g:351:103: 'in' temp= identifier { - match(input,62,FOLLOW_62_in_simpleOutPatternElement2258); if (failed) return ret2; + match(input,62,FOLLOW_62_in_simpleOutPatternElement2258); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_simpleOutPatternElement2262); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "model", "OclModel", "name", temp, "#all", "never", null, false, null); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4925,7 +5054,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4944,9 +5073,9 @@ public class ATL_ANTLR3Parser extends Parser { alt53=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("351:225: ( ( 'mapsTo' temp= identifier ) | () )", 53, 0, input); + new NoViableAltException("", 53, 0, input); throw nvae; } @@ -4957,18 +5086,19 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:351:226: ( 'mapsTo' temp= identifier ) // ATL_ANTLR3.g:351:227: 'mapsTo' temp= identifier { - match(input,64,FOLLOW_64_in_simpleOutPatternElement2278); if (failed) return ret2; + match(input,64,FOLLOW_64_in_simpleOutPatternElement2278); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_simpleOutPatternElement2282); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "sourceElement", "InPatternElement", "varName", temp, null, "never", null, false, null); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -4981,7 +5111,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -5000,9 +5130,9 @@ public class ATL_ANTLR3Parser extends Parser { alt56=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("351:370: ( ( RARROW LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) | () )", 56, 0, input); + new NoViableAltException("", 56, 0, input); throw nvae; } @@ -5013,8 +5143,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:351:371: ( RARROW LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) // ATL_ANTLR3.g:351:372: RARROW LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN { - match(input,RARROW,FOLLOW_RARROW_in_simpleOutPatternElement2298); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_simpleOutPatternElement2300); if (failed) return ret2; + match(input,RARROW,FOLLOW_RARROW_in_simpleOutPatternElement2298); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_simpleOutPatternElement2300); if (state.failed) return ret2; // ATL_ANTLR3.g:351:386: ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? int alt55=2; int LA55_0 = input.LA(1); @@ -5031,9 +5161,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_simpleOutPatternElement2306); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "reverseBindings", temp); } // ATL_ANTLR3.g:351:447: ( ( ( COMA ) temp= oclExpression ) )* @@ -5057,15 +5188,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:351:449: ( COMA ) // ATL_ANTLR3.g:351:450: COMA { - match(input,COMA,FOLLOW_COMA_in_simpleOutPatternElement2313); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_simpleOutPatternElement2313); if (state.failed) return ret2; } pushFollow(FOLLOW_oclExpression_in_simpleOutPatternElement2318); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "reverseBindings", temp); } @@ -5089,11 +5221,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_simpleOutPatternElement2328); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_simpleOutPatternElement2328); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -5106,7 +5238,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -5125,9 +5257,9 @@ public class ATL_ANTLR3Parser extends Parser { alt59=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("351:540: ( ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) | () )", 59, 0, input); + new NoViableAltException("", 59, 0, input); throw nvae; } @@ -5138,7 +5270,7 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:351:541: ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) // ATL_ANTLR3.g:351:542: LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN { - match(input,LPAREN,FOLLOW_LPAREN_in_simpleOutPatternElement2342); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_simpleOutPatternElement2342); if (state.failed) return ret2; // ATL_ANTLR3.g:351:549: ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) // ATL_ANTLR3.g:351:550: ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) { @@ -5161,9 +5293,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_binding_in_simpleOutPatternElement2350); temp=binding(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "bindings", temp); } // ATL_ANTLR3.g:351:599: ( ( ( COMA ) temp= binding ) )* @@ -5187,15 +5320,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:351:601: ( COMA ) // ATL_ANTLR3.g:351:602: COMA { - match(input,COMA,FOLLOW_COMA_in_simpleOutPatternElement2357); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_simpleOutPatternElement2357); if (state.failed) return ret2; } pushFollow(FOLLOW_binding_in_simpleOutPatternElement2362); temp=binding(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "bindings", temp); } @@ -5225,11 +5359,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_simpleOutPatternElement2374); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_simpleOutPatternElement2374); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -5242,7 +5376,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -5253,7 +5387,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -5273,10 +5407,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end simpleOutPatternElement + // $ANTLR end "simpleOutPatternElement" - // $ANTLR start forEachOutPatternElement + // $ANTLR start "forEachOutPatternElement" // ATL_ANTLR3.g:361:1: forEachOutPatternElement returns [Object ret2] : (temp= identifier COLON 'distinct' temp= oclType 'foreach' LPAREN temp= iterator 'in' temp= oclExpression RPAREN ( ( 'mapsTo' temp= identifier ) | () ) ( ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) | () ) ) ; public final Object forEachOutPatternElement() throws RecognitionException { Object ret2 = null; @@ -5284,7 +5418,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("ForEachOutPatternElement", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ForEachOutPatternElement", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:362:2: ( (temp= identifier COLON 'distinct' temp= oclType 'foreach' LPAREN temp= iterator 'in' temp= oclExpression RPAREN ( ( 'mapsTo' temp= identifier ) | () ) ( ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) | () ) ) ) // ATL_ANTLR3.g:362:4: (temp= identifier COLON 'distinct' temp= oclType 'foreach' LPAREN temp= iterator 'in' temp= oclExpression RPAREN ( ( 'mapsTo' temp= identifier ) | () ) ( ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) | () ) ) @@ -5294,38 +5428,42 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_forEachOutPatternElement2418); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "varName", temp); } - match(input,COLON,FOLLOW_COLON_in_forEachOutPatternElement2422); if (failed) return ret2; - match(input,65,FOLLOW_65_in_forEachOutPatternElement2424); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_forEachOutPatternElement2422); if (state.failed) return ret2; + match(input,65,FOLLOW_65_in_forEachOutPatternElement2424); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_forEachOutPatternElement2428); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "type", temp); } - match(input,66,FOLLOW_66_in_forEachOutPatternElement2432); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_forEachOutPatternElement2434); if (failed) return ret2; + match(input,66,FOLLOW_66_in_forEachOutPatternElement2432); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_forEachOutPatternElement2434); if (state.failed) return ret2; pushFollow(FOLLOW_iterator_in_forEachOutPatternElement2438); temp=iterator(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "iterator", temp); } - match(input,62,FOLLOW_62_in_forEachOutPatternElement2442); if (failed) return ret2; + match(input,62,FOLLOW_62_in_forEachOutPatternElement2442); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_forEachOutPatternElement2446); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "collection", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_forEachOutPatternElement2450); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_forEachOutPatternElement2450); if (state.failed) return ret2; // ATL_ANTLR3.g:362:242: ( ( 'mapsTo' temp= identifier ) | () ) int alt60=2; int LA60_0 = input.LA(1); @@ -5337,9 +5475,9 @@ public class ATL_ANTLR3Parser extends Parser { alt60=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("362:242: ( ( 'mapsTo' temp= identifier ) | () )", 60, 0, input); + new NoViableAltException("", 60, 0, input); throw nvae; } @@ -5350,18 +5488,19 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:362:243: ( 'mapsTo' temp= identifier ) // ATL_ANTLR3.g:362:244: 'mapsTo' temp= identifier { - match(input,64,FOLLOW_64_in_forEachOutPatternElement2454); if (failed) return ret2; + match(input,64,FOLLOW_64_in_forEachOutPatternElement2454); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_forEachOutPatternElement2458); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "sourceElement", "InPatternElement", "varName", temp, null, "never", null, false, null); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -5374,7 +5513,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -5393,9 +5532,9 @@ public class ATL_ANTLR3Parser extends Parser { alt63=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("362:387: ( ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) | () )", 63, 0, input); + new NoViableAltException("", 63, 0, input); throw nvae; } @@ -5406,7 +5545,7 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:362:388: ( LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN ) // ATL_ANTLR3.g:362:389: LPAREN ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) RPAREN { - match(input,LPAREN,FOLLOW_LPAREN_in_forEachOutPatternElement2474); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_forEachOutPatternElement2474); if (state.failed) return ret2; // ATL_ANTLR3.g:362:396: ( ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) ) // ATL_ANTLR3.g:362:397: ( ( (temp= binding ( ( ( COMA ) temp= binding ) )* ) )? ) { @@ -5429,9 +5568,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_binding_in_forEachOutPatternElement2482); temp=binding(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "bindings", temp); } // ATL_ANTLR3.g:362:446: ( ( ( COMA ) temp= binding ) )* @@ -5455,15 +5595,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:362:448: ( COMA ) // ATL_ANTLR3.g:362:449: COMA { - match(input,COMA,FOLLOW_COMA_in_forEachOutPatternElement2489); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_forEachOutPatternElement2489); if (state.failed) return ret2; } pushFollow(FOLLOW_binding_in_forEachOutPatternElement2494); temp=binding(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "bindings", temp); } @@ -5493,11 +5634,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_forEachOutPatternElement2506); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_forEachOutPatternElement2506); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -5510,7 +5651,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -5521,7 +5662,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -5541,10 +5682,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end forEachOutPatternElement + // $ANTLR end "forEachOutPatternElement" - // $ANTLR start binding + // $ANTLR start "binding" // ATL_ANTLR3.g:372:1: binding returns [Object ret2] : (temp= identifierOrKeyword ( ( ASSIGNARROW ) | ( LARROW ) ) temp= oclExpression ) ; public final Object binding() throws RecognitionException { Object ret2 = null; @@ -5552,7 +5693,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("Binding", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Binding", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:373:2: ( (temp= identifierOrKeyword ( ( ASSIGNARROW ) | ( LARROW ) ) temp= oclExpression ) ) // ATL_ANTLR3.g:373:4: (temp= identifierOrKeyword ( ( ASSIGNARROW ) | ( LARROW ) ) temp= oclExpression ) @@ -5562,9 +5703,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifierOrKeyword_in_binding2550); temp=identifierOrKeyword(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "propertyName", temp); } // ATL_ANTLR3.g:373:67: ( ( ASSIGNARROW ) | ( LARROW ) ) @@ -5578,9 +5720,9 @@ public class ATL_ANTLR3Parser extends Parser { alt64=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("373:67: ( ( ASSIGNARROW ) | ( LARROW ) )", 64, 0, input); + new NoViableAltException("", 64, 0, input); throw nvae; } @@ -5591,11 +5733,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:373:68: ( ASSIGNARROW ) // ATL_ANTLR3.g:373:69: ASSIGNARROW { - match(input,ASSIGNARROW,FOLLOW_ASSIGNARROW_in_binding2556); if (failed) return ret2; + match(input,ASSIGNARROW,FOLLOW_ASSIGNARROW_in_binding2556); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isAssignment", java.lang.Boolean.TRUE); } @@ -5607,11 +5749,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:373:138: ( LARROW ) // ATL_ANTLR3.g:373:139: LARROW { - match(input,LARROW,FOLLOW_LARROW_in_binding2563); if (failed) return ret2; + match(input,LARROW,FOLLOW_LARROW_in_binding2563); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isAssignment", java.lang.Boolean.FALSE); } @@ -5622,15 +5764,16 @@ public class ATL_ANTLR3Parser extends Parser { pushFollow(FOLLOW_oclExpression_in_binding2571); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "value", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -5650,15 +5793,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end binding + // $ANTLR end "binding" - // $ANTLR start dropPattern + // $ANTLR start "dropPattern" // ATL_ANTLR3.g:383:1: dropPattern returns [Object ret2] : ( 'drop' ) ; public final Object dropPattern() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("DropPattern", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("DropPattern", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:384:2: ( ( 'drop' ) ) // ATL_ANTLR3.g:384:4: ( 'drop' ) @@ -5666,11 +5809,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:384:4: ( 'drop' ) // ATL_ANTLR3.g:384:5: 'drop' { - match(input,67,FOLLOW_67_in_dropPattern2605); if (failed) return ret2; + match(input,67,FOLLOW_67_in_dropPattern2605); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -5690,10 +5833,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end dropPattern + // $ANTLR end "dropPattern" - // $ANTLR start actionBlock + // $ANTLR start "actionBlock" // ATL_ANTLR3.g:394:1: actionBlock returns [Object ret2] : ( 'do' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; public final Object actionBlock() throws RecognitionException { Object ret2 = null; @@ -5701,7 +5844,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("ActionBlock", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ActionBlock", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:395:2: ( ( 'do' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) // ATL_ANTLR3.g:395:4: ( 'do' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) @@ -5709,8 +5852,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:395:4: ( 'do' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) // ATL_ANTLR3.g:395:5: 'do' LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,68,FOLLOW_68_in_actionBlock2637); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_actionBlock2639); if (failed) return ret2; + match(input,68,FOLLOW_68_in_actionBlock2637); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_actionBlock2639); if (state.failed) return ret2; // ATL_ANTLR3.g:395:17: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) // ATL_ANTLR3.g:395:18: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { @@ -5733,9 +5876,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_actionBlock2647); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "statements", temp); } // ATL_ANTLR3.g:395:71: ( (temp= statement ) )* @@ -5758,9 +5902,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_actionBlock2655); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "statements", temp); } @@ -5790,11 +5935,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_actionBlock2667); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_actionBlock2667); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -5814,10 +5959,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end actionBlock + // $ANTLR end "actionBlock" - // $ANTLR start statement + // $ANTLR start "statement" // ATL_ANTLR3.g:405:1: statement returns [Object ret2] : ( (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat ) ) ; public final Object statement() throws RecognitionException { Object ret2 = null; @@ -5834,563 +5979,16 @@ public class ATL_ANTLR3Parser extends Parser { { // ATL_ANTLR3.g:406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat ) int alt67=4; - switch ( input.LA(1) ) { - case 69: - { - int LA67_1 = input.LA(2); - - if ( (synpred125()) ) { - alt67=1; - } - else if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 1, input); - - throw nvae; - } - } - break; - case 94: - { - int LA67_2 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 2, input); - - throw nvae; - } - } - break; - case MINUS: - { - int LA67_3 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 3, input); - - throw nvae; - } - } - break; - case LPAREN: - { - int LA67_4 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 4, input); - - throw nvae; - } - } - break; - case NAME: - { - int LA67_5 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 5, input); - - throw nvae; - } - } - break; - case 73: - { - int LA67_6 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 6, input); - - throw nvae; - } - } - break; - case INT: - { - int LA67_7 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 7, input); - - throw nvae; - } - } - break; - case FLOAT: - { - int LA67_8 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 8, input); - - throw nvae; - } - } - break; - case 74: - { - int LA67_9 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 9, input); - - throw nvae; - } - } - break; - case 75: - { - int LA67_10 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 10, input); - - throw nvae; - } - } - break; - case STRING: - { - int LA67_11 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 11, input); - - throw nvae; - } - } - break; - case 78: - { - int LA67_12 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 12, input); - - throw nvae; - } - } - break; - case SHARP: - { - int LA67_13 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 13, input); - - throw nvae; - } - } - break; - case 80: - { - int LA67_14 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 14, input); - - throw nvae; - } - } - break; - case 81: - { - int LA67_15 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 15, input); - - throw nvae; - } - } - break; - case 82: - { - int LA67_16 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 16, input); - - throw nvae; - } - } - break; - case 83: - { - int LA67_17 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 17, input); - - throw nvae; - } - } - break; - case 84: - { - int LA67_18 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 18, input); - - throw nvae; - } - } - break; - case 85: - { - int LA67_19 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 19, input); - - throw nvae; - } - } - break; - case 87: - { - int LA67_20 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 20, input); - - throw nvae; - } - } - break; - case 88: - { - int LA67_21 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 21, input); - - throw nvae; - } - } - break; - case 89: - { - int LA67_22 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 22, input); - - throw nvae; - } - } - break; - case 90: - { - int LA67_23 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 23, input); - - throw nvae; - } - } - break; - case 91: - { - int LA67_24 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 24, input); - - throw nvae; - } - } - break; - case 92: - { - int LA67_25 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 25, input); - - throw nvae; - } - } - break; - case 93: - { - int LA67_26 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 26, input); - - throw nvae; - } - } - break; - case 86: - { - int LA67_27 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 27, input); - - throw nvae; - } - } - break; - case 79: - { - int LA67_28 = input.LA(2); - - if ( (synpred126()) ) { - alt67=2; - } - else if ( (synpred127()) ) { - alt67=3; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 28, input); - - throw nvae; - } - } - break; - case 71: - { - alt67=4; - } - break; - default: - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )", 67, 0, input); - - throw nvae; - } - + alt67 = dfa67.predict(input); switch (alt67) { case 1 : // ATL_ANTLR3.g:406:6: ret= ifStat { pushFollow(FOLLOW_ifStat_in_statement2702); ret=ifStat(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -6399,8 +5997,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_expressionStat_in_statement2707); ret=expressionStat(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -6409,8 +6008,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_bindingStat_in_statement2712); ret=bindingStat(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -6419,8 +6019,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_forStat_in_statement2717); ret=forStat(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -6430,7 +6031,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -6448,10 +6049,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end statement + // $ANTLR end "statement" - // $ANTLR start bindingStat + // $ANTLR start "bindingStat" // ATL_ANTLR3.g:414:1: bindingStat returns [Object ret2] : (temp= oclExpression ( ( ASSIGNARROW ) | ( LARROW ) ) temp= oclExpression SEMI ) ; public final Object bindingStat() throws RecognitionException { Object ret2 = null; @@ -6459,7 +6060,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("BindingStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("BindingStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:415:2: ( (temp= oclExpression ( ( ASSIGNARROW ) | ( LARROW ) ) temp= oclExpression SEMI ) ) // ATL_ANTLR3.g:415:4: (temp= oclExpression ( ( ASSIGNARROW ) | ( LARROW ) ) temp= oclExpression SEMI ) @@ -6469,9 +6070,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_bindingStat2752); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "source", temp); } // ATL_ANTLR3.g:415:55: ( ( ASSIGNARROW ) | ( LARROW ) ) @@ -6485,9 +6087,9 @@ public class ATL_ANTLR3Parser extends Parser { alt68=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("415:55: ( ( ASSIGNARROW ) | ( LARROW ) )", 68, 0, input); + new NoViableAltException("", 68, 0, input); throw nvae; } @@ -6498,11 +6100,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:415:56: ( ASSIGNARROW ) // ATL_ANTLR3.g:415:57: ASSIGNARROW { - match(input,ASSIGNARROW,FOLLOW_ASSIGNARROW_in_bindingStat2758); if (failed) return ret2; + match(input,ASSIGNARROW,FOLLOW_ASSIGNARROW_in_bindingStat2758); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isAssignment", java.lang.Boolean.TRUE); } @@ -6514,11 +6116,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:415:126: ( LARROW ) // ATL_ANTLR3.g:415:127: LARROW { - match(input,LARROW,FOLLOW_LARROW_in_bindingStat2765); if (failed) return ret2; + match(input,LARROW,FOLLOW_LARROW_in_bindingStat2765); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isAssignment", java.lang.Boolean.FALSE); } @@ -6529,16 +6131,17 @@ public class ATL_ANTLR3Parser extends Parser { pushFollow(FOLLOW_oclExpression_in_bindingStat2773); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "value", temp); } - match(input,SEMI,FOLLOW_SEMI_in_bindingStat2777); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_bindingStat2777); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -6558,10 +6161,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end bindingStat + // $ANTLR end "bindingStat" - // $ANTLR start expressionStat + // $ANTLR start "expressionStat" // ATL_ANTLR3.g:425:1: expressionStat returns [Object ret2] : (temp= oclExpression SEMI ) ; public final Object expressionStat() throws RecognitionException { Object ret2 = null; @@ -6569,7 +6172,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("ExpressionStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ExpressionStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:426:2: ( (temp= oclExpression SEMI ) ) // ATL_ANTLR3.g:426:4: (temp= oclExpression SEMI ) @@ -6579,16 +6182,17 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_expressionStat2811); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "expression", temp); } - match(input,SEMI,FOLLOW_SEMI_in_expressionStat2815); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_expressionStat2815); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -6608,10 +6212,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end expressionStat + // $ANTLR end "expressionStat" - // $ANTLR start ifStat + // $ANTLR start "ifStat" // ATL_ANTLR3.g:436:1: ifStat returns [Object ret2] : ( 'if' LPAREN temp= oclExpression RPAREN ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ( ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) | () ) ) ; public final Object ifStat() throws RecognitionException { Object ret2 = null; @@ -6619,7 +6223,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("IfStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("IfStat", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:437:2: ( ( 'if' LPAREN temp= oclExpression RPAREN ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ( ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) | () ) ) ) // ATL_ANTLR3.g:437:4: ( 'if' LPAREN temp= oclExpression RPAREN ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ( ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) | () ) ) @@ -6627,16 +6231,17 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:437:4: ( 'if' LPAREN temp= oclExpression RPAREN ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ( ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) | () ) ) // ATL_ANTLR3.g:437:5: 'if' LPAREN temp= oclExpression RPAREN ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ( ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) | () ) { - match(input,69,FOLLOW_69_in_ifStat2847); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_ifStat2849); if (failed) return ret2; + match(input,69,FOLLOW_69_in_ifStat2847); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_ifStat2849); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_ifStat2853); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "condition", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_ifStat2857); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_ifStat2857); if (state.failed) return ret2; // ATL_ANTLR3.g:437:77: ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) int alt71=2; int LA71_0 = input.LA(1); @@ -6648,9 +6253,9 @@ public class ATL_ANTLR3Parser extends Parser { alt71=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("437:77: ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) )", 71, 0, input); + new NoViableAltException("", 71, 0, input); throw nvae; } @@ -6669,9 +6274,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_ifStat2865); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "thenStatements", temp); } @@ -6683,7 +6289,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -6694,7 +6300,7 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:437:142: ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) // ATL_ANTLR3.g:437:143: LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,LCURLY,FOLLOW_LCURLY_in_ifStat2876); if (failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_ifStat2876); if (state.failed) return ret2; // ATL_ANTLR3.g:437:150: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) // ATL_ANTLR3.g:437:151: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { @@ -6717,9 +6323,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_ifStat2884); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "thenStatements", temp); } // ATL_ANTLR3.g:437:208: ( (temp= statement ) )* @@ -6742,9 +6349,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_ifStat2892); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "thenStatements", temp); } @@ -6774,11 +6382,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_ifStat2904); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_ifStat2904); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -6793,16 +6401,16 @@ public class ATL_ANTLR3Parser extends Parser { if ( (LA75_0==70) ) { int LA75_1 = input.LA(2); - if ( (synpred135()) ) { + if ( (synpred135_ATL_ANTLR3()) ) { alt75=1; } else if ( (true) ) { alt75=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("437:284: ( ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) | () )", 75, 1, input); + new NoViableAltException("", 75, 1, input); throw nvae; } @@ -6811,9 +6419,9 @@ public class ATL_ANTLR3Parser extends Parser { alt75=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("437:284: ( ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) | () )", 75, 0, input); + new NoViableAltException("", 75, 0, input); throw nvae; } @@ -6824,7 +6432,7 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:437:285: ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) // ATL_ANTLR3.g:437:286: 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) { - match(input,70,FOLLOW_70_in_ifStat2912); if (failed) return ret2; + match(input,70,FOLLOW_70_in_ifStat2912); if (state.failed) return ret2; // ATL_ANTLR3.g:437:293: ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) int alt74=2; int LA74_0 = input.LA(1); @@ -6836,9 +6444,9 @@ public class ATL_ANTLR3Parser extends Parser { alt74=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("437:293: ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) )", 74, 0, input); + new NoViableAltException("", 74, 0, input); throw nvae; } @@ -6857,9 +6465,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_ifStat2920); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elseStatements", temp); } @@ -6871,7 +6480,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -6882,7 +6491,7 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:437:358: ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) // ATL_ANTLR3.g:437:359: LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,LCURLY,FOLLOW_LCURLY_in_ifStat2931); if (failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_ifStat2931); if (state.failed) return ret2; // ATL_ANTLR3.g:437:366: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) // ATL_ANTLR3.g:437:367: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { @@ -6905,9 +6514,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_ifStat2939); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elseStatements", temp); } // ATL_ANTLR3.g:437:424: ( (temp= statement ) )* @@ -6930,9 +6540,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_ifStat2947); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elseStatements", temp); } @@ -6962,11 +6573,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_ifStat2959); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_ifStat2959); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -6977,7 +6588,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -6990,7 +6601,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -7001,7 +6612,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -7021,10 +6632,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end ifStat + // $ANTLR end "ifStat" - // $ANTLR start forStat + // $ANTLR start "forStat" // ATL_ANTLR3.g:447:1: forStat returns [Object ret2] : ( 'for' LPAREN temp= iterator 'in' temp= oclExpression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ; public final Object forStat() throws RecognitionException { Object ret2 = null; @@ -7032,7 +6643,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("ForStat", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("ForStat", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:448:2: ( ( 'for' LPAREN temp= iterator 'in' temp= oclExpression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) // ATL_ANTLR3.g:448:4: ( 'for' LPAREN temp= iterator 'in' temp= oclExpression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) @@ -7040,25 +6651,27 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:448:4: ( 'for' LPAREN temp= iterator 'in' temp= oclExpression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) // ATL_ANTLR3.g:448:5: 'for' LPAREN temp= iterator 'in' temp= oclExpression RPAREN LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,71,FOLLOW_71_in_forStat3005); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_forStat3007); if (failed) return ret2; + match(input,71,FOLLOW_71_in_forStat3005); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_forStat3007); if (state.failed) return ret2; pushFollow(FOLLOW_iterator_in_forStat3011); temp=iterator(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "iterator", temp); } - match(input,62,FOLLOW_62_in_forStat3015); if (failed) return ret2; + match(input,62,FOLLOW_62_in_forStat3015); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_forStat3019); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "collection", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_forStat3023); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_forStat3025); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_forStat3023); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_forStat3025); if (state.failed) return ret2; // ATL_ANTLR3.g:448:138: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) // ATL_ANTLR3.g:448:139: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { @@ -7081,9 +6694,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_forStat3033); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "statements", temp); } // ATL_ANTLR3.g:448:192: ( (temp= statement ) )* @@ -7106,9 +6720,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_statement_in_forStat3041); temp=statement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "statements", temp); } @@ -7138,11 +6753,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_forStat3053); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_forStat3053); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -7162,10 +6777,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end forStat + // $ANTLR end "forStat" - // $ANTLR start oclModel + // $ANTLR start "oclModel" // ATL_ANTLR3.g:458:1: oclModel returns [Object ret2] : (temp= identifier COLON temp= identifier ) ; public final Object oclModel() throws RecognitionException { Object ret2 = null; @@ -7173,7 +6788,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("OclModel", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OclModel", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:459:2: ( (temp= identifier COLON temp= identifier ) ) // ATL_ANTLR3.g:459:4: (temp= identifier COLON temp= identifier ) @@ -7183,23 +6798,25 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_oclModel3087); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,COLON,FOLLOW_COLON_in_oclModel3091); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_oclModel3091); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_oclModel3095); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "metamodel", "OclModel", "name", temp, "#all", "ifmissing", null, false, null); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -7219,10 +6836,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclModel + // $ANTLR end "oclModel" - // $ANTLR start oclModelElement + // $ANTLR start "oclModelElement" // ATL_ANTLR3.g:469:1: oclModelElement returns [Object ret2] : (temp= identifier EXCL temp= identifier ) ; public final Object oclModelElement() throws RecognitionException { Object ret2 = null; @@ -7230,7 +6847,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("OclModelElement", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OclModelElement", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:470:2: ( (temp= identifier EXCL temp= identifier ) ) // ATL_ANTLR3.g:470:4: (temp= identifier EXCL temp= identifier ) @@ -7240,23 +6857,25 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_oclModelElement3131); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "model", "OclModel", "name", temp, "#all", "ifmissing", null, false, null); } - match(input,EXCL,FOLLOW_EXCL_in_oclModelElement3135); if (failed) return ret2; + match(input,EXCL,FOLLOW_EXCL_in_oclModelElement3135); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_oclModelElement3139); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -7276,10 +6895,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclModelElement + // $ANTLR end "oclModelElement" - // $ANTLR start oclExpression + // $ANTLR start "oclExpression" // ATL_ANTLR3.g:480:1: oclExpression returns [Object ret2] : (ret= priority_5 | ret= letExp ) ; public final Object oclExpression() throws RecognitionException { Object ret2 = null; @@ -7302,9 +6921,9 @@ public class ATL_ANTLR3Parser extends Parser { alt78=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("481:4: (ret= priority_5 | ret= letExp )", 78, 0, input); + new NoViableAltException("", 78, 0, input); throw nvae; } @@ -7314,8 +6933,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_priority_5_in_oclExpression3175); ret=priority_5(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -7324,15 +6944,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_letExp_in_oclExpression3180); ret=letExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -7349,10 +6970,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclExpression + // $ANTLR end "oclExpression" - // $ANTLR start iteratorExp + // $ANTLR start "iteratorExp" // ATL_ANTLR3.g:488:1: iteratorExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifier LPAREN ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) PIPE ( (temp= oclExpression ) ) RPAREN ) ; public final Object iteratorExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; @@ -7360,7 +6981,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("IteratorExp", true, false) : null; + Object ret=(state.backtracking==0) ? ei.create("IteratorExp", true, false) : null; try { // ATL_ANTLR3.g:489:2: ( (temp= identifier LPAREN ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) PIPE ( (temp= oclExpression ) ) RPAREN ) ) // ATL_ANTLR3.g:489:4: (temp= identifier LPAREN ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) PIPE ( (temp= oclExpression ) ) RPAREN ) @@ -7370,12 +6991,13 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_iteratorExp3215); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,LPAREN,FOLLOW_LPAREN_in_iteratorExp3219); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_iteratorExp3219); if (state.failed) return ret2; // ATL_ANTLR3.g:489:57: ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) // ATL_ANTLR3.g:489:58: (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) { @@ -7384,9 +7006,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_iterator_in_iteratorExp3225); temp=iterator(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "iterators", temp); } // ATL_ANTLR3.g:489:107: ( ( ( COMA ) temp= iterator ) )* @@ -7410,15 +7033,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:489:109: ( COMA ) // ATL_ANTLR3.g:489:110: COMA { - match(input,COMA,FOLLOW_COMA_in_iteratorExp3232); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_iteratorExp3232); if (state.failed) return ret2; } pushFollow(FOLLOW_iterator_in_iteratorExp3237); temp=iterator(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "iterators", temp); } @@ -7439,7 +7063,7 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,PIPE,FOLLOW_PIPE_in_iteratorExp3246); if (failed) return ret2; + match(input,PIPE,FOLLOW_PIPE_in_iteratorExp3246); if (state.failed) return ret2; // ATL_ANTLR3.g:489:174: ( (temp= oclExpression ) ) // ATL_ANTLR3.g:489:175: (temp= oclExpression ) { @@ -7448,9 +7072,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_iteratorExp3252); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "body", temp); } @@ -7459,11 +7084,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_iteratorExp3258); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_iteratorExp3258); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { // discard operator name ei.set(ret, "source", left); @@ -7485,10 +7110,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end iteratorExp + // $ANTLR end "iteratorExp" - // $ANTLR start iterateExp + // $ANTLR start "iterateExp" // ATL_ANTLR3.g:501:1: iterateExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : ( 'iterate' LPAREN ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) SEMI temp= variableDeclaration PIPE ( (temp= oclExpression ) ) RPAREN ) ; public final Object iterateExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; @@ -7496,7 +7121,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("IterateExp", true, false) : null; + Object ret=(state.backtracking==0) ? ei.create("IterateExp", true, false) : null; try { // ATL_ANTLR3.g:502:2: ( ( 'iterate' LPAREN ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) SEMI temp= variableDeclaration PIPE ( (temp= oclExpression ) ) RPAREN ) ) // ATL_ANTLR3.g:502:4: ( 'iterate' LPAREN ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) SEMI temp= variableDeclaration PIPE ( (temp= oclExpression ) ) RPAREN ) @@ -7504,8 +7129,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:502:4: ( 'iterate' LPAREN ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) SEMI temp= variableDeclaration PIPE ( (temp= oclExpression ) ) RPAREN ) // ATL_ANTLR3.g:502:5: 'iterate' LPAREN ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) SEMI temp= variableDeclaration PIPE ( (temp= oclExpression ) ) RPAREN { - match(input,72,FOLLOW_72_in_iterateExp3291); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_iterateExp3293); if (failed) return ret2; + match(input,72,FOLLOW_72_in_iterateExp3291); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_iterateExp3293); if (state.failed) return ret2; // ATL_ANTLR3.g:502:22: ( (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) ) // ATL_ANTLR3.g:502:23: (temp= iterator ( ( ( COMA ) temp= iterator ) )* ) { @@ -7514,9 +7139,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_iterator_in_iterateExp3299); temp=iterator(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "iterators", temp); } // ATL_ANTLR3.g:502:72: ( ( ( COMA ) temp= iterator ) )* @@ -7540,15 +7166,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:502:74: ( COMA ) // ATL_ANTLR3.g:502:75: COMA { - match(input,COMA,FOLLOW_COMA_in_iterateExp3306); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_iterateExp3306); if (state.failed) return ret2; } pushFollow(FOLLOW_iterator_in_iterateExp3311); temp=iterator(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "iterators", temp); } @@ -7569,15 +7196,16 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,SEMI,FOLLOW_SEMI_in_iterateExp3320); if (failed) return ret2; + match(input,SEMI,FOLLOW_SEMI_in_iterateExp3320); if (state.failed) return ret2; pushFollow(FOLLOW_variableDeclaration_in_iterateExp3324); temp=variableDeclaration(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "result", temp); } - match(input,PIPE,FOLLOW_PIPE_in_iterateExp3328); if (failed) return ret2; + match(input,PIPE,FOLLOW_PIPE_in_iterateExp3328); if (state.failed) return ret2; // ATL_ANTLR3.g:502:200: ( (temp= oclExpression ) ) // ATL_ANTLR3.g:502:201: (temp= oclExpression ) { @@ -7586,9 +7214,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_iterateExp3334); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "body", temp); } @@ -7597,11 +7226,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_iterateExp3340); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_iterateExp3340); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { // discard operator name ei.set(ret, "source", left); @@ -7623,10 +7252,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end iterateExp + // $ANTLR end "iterateExp" - // $ANTLR start collectionOperationCallExp + // $ANTLR start "collectionOperationCallExp" // ATL_ANTLR3.g:514:1: collectionOperationCallExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifier LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) ; public final Object collectionOperationCallExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; @@ -7634,7 +7263,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("CollectionOperationCallExp", false, false) : null; + Object ret=(state.backtracking==0) ? ei.create("CollectionOperationCallExp", false, false) : null; try { // ATL_ANTLR3.g:515:2: ( (temp= identifier LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) ) // ATL_ANTLR3.g:515:4: (temp= identifier LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) @@ -7644,12 +7273,13 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_collectionOperationCallExp3375); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "operationName", temp); } - match(input,LPAREN,FOLLOW_LPAREN_in_collectionOperationCallExp3379); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_collectionOperationCallExp3379); if (state.failed) return ret2; // ATL_ANTLR3.g:515:66: ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? int alt82=2; int LA82_0 = input.LA(1); @@ -7666,9 +7296,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_collectionOperationCallExp3385); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", temp); } // ATL_ANTLR3.g:515:121: ( ( ( COMA ) temp= oclExpression ) )* @@ -7692,15 +7323,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:515:123: ( COMA ) // ATL_ANTLR3.g:515:124: COMA { - match(input,COMA,FOLLOW_COMA_in_collectionOperationCallExp3392); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_collectionOperationCallExp3392); if (state.failed) return ret2; } pushFollow(FOLLOW_oclExpression_in_collectionOperationCallExp3397); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", temp); } @@ -7724,11 +7356,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_collectionOperationCallExp3407); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_collectionOperationCallExp3407); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { // discard operator name ei.set(ret, "source", left); @@ -7750,10 +7382,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end collectionOperationCallExp + // $ANTLR end "collectionOperationCallExp" - // $ANTLR start operationCallExp + // $ANTLR start "operationCallExp" // ATL_ANTLR3.g:527:1: operationCallExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifierOrKeyword LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) ; public final Object operationCallExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; @@ -7761,7 +7393,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("OperationCallExp", false, false) : null; + Object ret=(state.backtracking==0) ? ei.create("OperationCallExp", false, false) : null; try { // ATL_ANTLR3.g:528:2: ( (temp= identifierOrKeyword LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) ) // ATL_ANTLR3.g:528:4: (temp= identifierOrKeyword LPAREN ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RPAREN ) @@ -7771,12 +7403,13 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifierOrKeyword_in_operationCallExp3442); temp=identifierOrKeyword(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "operationName", temp); } - match(input,LPAREN,FOLLOW_LPAREN_in_operationCallExp3446); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_operationCallExp3446); if (state.failed) return ret2; // ATL_ANTLR3.g:528:75: ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? int alt84=2; int LA84_0 = input.LA(1); @@ -7793,9 +7426,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_operationCallExp3452); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", temp); } // ATL_ANTLR3.g:528:130: ( ( ( COMA ) temp= oclExpression ) )* @@ -7819,15 +7453,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:528:132: ( COMA ) // ATL_ANTLR3.g:528:133: COMA { - match(input,COMA,FOLLOW_COMA_in_operationCallExp3459); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_operationCallExp3459); if (state.failed) return ret2; } pushFollow(FOLLOW_oclExpression_in_operationCallExp3464); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", temp); } @@ -7851,11 +7486,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_operationCallExp3474); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_operationCallExp3474); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { // discard operator name ei.set(ret, "source", left); @@ -7877,10 +7512,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end operationCallExp + // $ANTLR end "operationCallExp" - // $ANTLR start navigationOrAttributeCallExp + // $ANTLR start "navigationOrAttributeCallExp" // ATL_ANTLR3.g:540:1: navigationOrAttributeCallExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : (temp= identifierOrKeyword ) ; public final Object navigationOrAttributeCallExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; @@ -7888,7 +7523,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("NavigationOrAttributeCallExp", false, false) : null; + Object ret=(state.backtracking==0) ? ei.create("NavigationOrAttributeCallExp", false, false) : null; try { // ATL_ANTLR3.g:541:2: ( (temp= identifierOrKeyword ) ) // ATL_ANTLR3.g:541:4: (temp= identifierOrKeyword ) @@ -7898,15 +7533,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifierOrKeyword_in_navigationOrAttributeCallExp3509); temp=identifierOrKeyword(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { // discard operator name ei.set(ret, "source", left); @@ -7928,20 +7564,20 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end navigationOrAttributeCallExp + // $ANTLR end "navigationOrAttributeCallExp" - // $ANTLR start operatorCallExp + // $ANTLR start "operatorCallExp" // ATL_ANTLR3.g:553:1: operatorCallExp[java.lang.String opName, Object left, org.antlr.runtime.Token firstToken] returns [Object ret2] : ; public final Object operatorCallExp(java.lang.String opName, Object left, org.antlr.runtime.Token firstToken) throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("OperatorCallExp", false, false) : null; + Object ret=(state.backtracking==0) ? ei.create("OperatorCallExp", false, false) : null; try { // ATL_ANTLR3.g:554:2: () // ATL_ANTLR3.g:555:9: { - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "operationName", opName); ei.set(ret, "source", left); @@ -7958,10 +7594,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end operatorCallExp + // $ANTLR end "operatorCallExp" - // $ANTLR start iterator + // $ANTLR start "iterator" // ATL_ANTLR3.g:565:1: iterator returns [Object ret2] : (temp= identifier ) ; public final Object iterator() throws RecognitionException { Object ret2 = null; @@ -7969,7 +7605,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("Iterator", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("Iterator", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:566:2: ( (temp= identifier ) ) // ATL_ANTLR3.g:566:4: (temp= identifier ) @@ -7979,15 +7615,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_iterator3574); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "varName", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8007,15 +7644,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end iterator + // $ANTLR end "iterator" - // $ANTLR start oclUndefinedExp + // $ANTLR start "oclUndefinedExp" // ATL_ANTLR3.g:576:1: oclUndefinedExp returns [Object ret2] : ( 'OclUndefined' ) ; public final Object oclUndefinedExp() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("OclUndefinedExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OclUndefinedExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:577:2: ( ( 'OclUndefined' ) ) // ATL_ANTLR3.g:577:4: ( 'OclUndefined' ) @@ -8023,11 +7660,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:577:4: ( 'OclUndefined' ) // ATL_ANTLR3.g:577:5: 'OclUndefined' { - match(input,73,FOLLOW_73_in_oclUndefinedExp3608); if (failed) return ret2; + match(input,73,FOLLOW_73_in_oclUndefinedExp3608); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8047,10 +7684,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclUndefinedExp + // $ANTLR end "oclUndefinedExp" - // $ANTLR start primitiveExp + // $ANTLR start "primitiveExp" // ATL_ANTLR3.g:587:1: primitiveExp returns [Object ret2] : ( (ret= numericExp | ret= booleanExp | ret= stringExp ) ) ; public final Object primitiveExp() throws RecognitionException { Object ret2 = null; @@ -8086,9 +7723,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("588:5: (ret= numericExp | ret= booleanExp | ret= stringExp )", 85, 0, input); + new NoViableAltException("", 85, 0, input); throw nvae; } @@ -8099,8 +7736,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_numericExp_in_primitiveExp3643); ret=numericExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -8109,8 +7747,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_booleanExp_in_primitiveExp3648); ret=booleanExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -8119,8 +7758,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_stringExp_in_primitiveExp3653); ret=stringExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -8130,7 +7770,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -8148,10 +7788,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end primitiveExp + // $ANTLR end "primitiveExp" - // $ANTLR start numericExp + // $ANTLR start "numericExp" // ATL_ANTLR3.g:596:1: numericExp returns [Object ret2] : ( (ret= integerExp | ret= realExp ) ) ; public final Object numericExp() throws RecognitionException { Object ret2 = null; @@ -8177,9 +7817,9 @@ public class ATL_ANTLR3Parser extends Parser { alt86=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("597:5: (ret= integerExp | ret= realExp )", 86, 0, input); + new NoViableAltException("", 86, 0, input); throw nvae; } @@ -8189,8 +7829,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_integerExp_in_numericExp3689); ret=integerExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -8199,8 +7840,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_realExp_in_numericExp3694); ret=realExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -8210,7 +7852,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -8228,15 +7870,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end numericExp + // $ANTLR end "numericExp" - // $ANTLR start booleanExp + // $ANTLR start "booleanExp" // ATL_ANTLR3.g:605:1: booleanExp returns [Object ret2] : ( ( ( 'true' ) | ( 'false' ) ) ) ; public final Object booleanExp() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("BooleanExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("BooleanExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:606:2: ( ( ( ( 'true' ) | ( 'false' ) ) ) ) // ATL_ANTLR3.g:606:4: ( ( ( 'true' ) | ( 'false' ) ) ) @@ -8255,9 +7897,9 @@ public class ATL_ANTLR3Parser extends Parser { alt87=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("606:5: ( ( 'true' ) | ( 'false' ) )", 87, 0, input); + new NoViableAltException("", 87, 0, input); throw nvae; } @@ -8268,11 +7910,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:606:6: ( 'true' ) // ATL_ANTLR3.g:606:7: 'true' { - match(input,74,FOLLOW_74_in_booleanExp3729); if (failed) return ret2; + match(input,74,FOLLOW_74_in_booleanExp3729); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "booleanSymbol", java.lang.Boolean.TRUE); } @@ -8284,11 +7926,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:606:72: ( 'false' ) // ATL_ANTLR3.g:606:73: 'false' { - match(input,75,FOLLOW_75_in_booleanExp3736); if (failed) return ret2; + match(input,75,FOLLOW_75_in_booleanExp3736); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "booleanSymbol", java.lang.Boolean.FALSE); } @@ -8300,7 +7942,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8320,10 +7962,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end booleanExp + // $ANTLR end "booleanExp" - // $ANTLR start integerExp + // $ANTLR start "integerExp" // ATL_ANTLR3.g:616:1: integerExp returns [Object ret2] : (temp= integerSymbol ) ; public final Object integerExp() throws RecognitionException { Object ret2 = null; @@ -8331,7 +7973,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("IntegerExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("IntegerExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:617:2: ( (temp= integerSymbol ) ) // ATL_ANTLR3.g:617:4: (temp= integerSymbol ) @@ -8341,15 +7983,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_integerSymbol_in_integerExp3774); temp=integerSymbol(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "integerSymbol", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8369,10 +8012,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end integerExp + // $ANTLR end "integerExp" - // $ANTLR start realExp + // $ANTLR start "realExp" // ATL_ANTLR3.g:627:1: realExp returns [Object ret2] : (temp= floatSymbol ) ; public final Object realExp() throws RecognitionException { Object ret2 = null; @@ -8380,7 +8023,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("RealExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("RealExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:628:2: ( (temp= floatSymbol ) ) // ATL_ANTLR3.g:628:4: (temp= floatSymbol ) @@ -8390,15 +8033,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_floatSymbol_in_realExp3810); temp=floatSymbol(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "realSymbol", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8418,10 +8062,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end realExp + // $ANTLR end "realExp" - // $ANTLR start stringExp + // $ANTLR start "stringExp" // ATL_ANTLR3.g:638:1: stringExp returns [Object ret2] : (temp= stringSymbol ) ; public final Object stringExp() throws RecognitionException { Object ret2 = null; @@ -8429,7 +8073,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("StringExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("StringExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:639:2: ( (temp= stringSymbol ) ) // ATL_ANTLR3.g:639:4: (temp= stringSymbol ) @@ -8439,15 +8083,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_stringSymbol_in_stringExp3846); temp=stringSymbol(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "stringSymbol", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8467,10 +8112,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end stringExp + // $ANTLR end "stringExp" - // $ANTLR start ifExp + // $ANTLR start "ifExp" // ATL_ANTLR3.g:649:1: ifExp returns [Object ret2] : ( 'if' temp= oclExpression 'then' ( (temp= oclExpression ) ) 'else' ( (temp= oclExpression ) ) 'endif' ) ; public final Object ifExp() throws RecognitionException { Object ret2 = null; @@ -8478,7 +8123,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("IfExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("IfExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:650:2: ( ( 'if' temp= oclExpression 'then' ( (temp= oclExpression ) ) 'else' ( (temp= oclExpression ) ) 'endif' ) ) // ATL_ANTLR3.g:650:4: ( 'if' temp= oclExpression 'then' ( (temp= oclExpression ) ) 'else' ( (temp= oclExpression ) ) 'endif' ) @@ -8486,15 +8131,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:650:4: ( 'if' temp= oclExpression 'then' ( (temp= oclExpression ) ) 'else' ( (temp= oclExpression ) ) 'endif' ) // ATL_ANTLR3.g:650:5: 'if' temp= oclExpression 'then' ( (temp= oclExpression ) ) 'else' ( (temp= oclExpression ) ) 'endif' { - match(input,69,FOLLOW_69_in_ifExp3880); if (failed) return ret2; + match(input,69,FOLLOW_69_in_ifExp3880); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_ifExp3884); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "condition", temp); } - match(input,76,FOLLOW_76_in_ifExp3888); if (failed) return ret2; + match(input,76,FOLLOW_76_in_ifExp3888); if (state.failed) return ret2; // ATL_ANTLR3.g:650:70: ( (temp= oclExpression ) ) // ATL_ANTLR3.g:650:71: (temp= oclExpression ) { @@ -8503,9 +8149,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_ifExp3894); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "thenExpression", temp); } @@ -8514,7 +8161,7 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,70,FOLLOW_70_in_ifExp3900); if (failed) return ret2; + match(input,70,FOLLOW_70_in_ifExp3900); if (state.failed) return ret2; // ATL_ANTLR3.g:650:139: ( (temp= oclExpression ) ) // ATL_ANTLR3.g:650:140: (temp= oclExpression ) { @@ -8523,9 +8170,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_ifExp3906); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elseExpression", temp); } @@ -8534,11 +8182,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,77,FOLLOW_77_in_ifExp3912); if (failed) return ret2; + match(input,77,FOLLOW_77_in_ifExp3912); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8558,10 +8206,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end ifExp + // $ANTLR end "ifExp" - // $ANTLR start variableExp + // $ANTLR start "variableExp" // ATL_ANTLR3.g:660:1: variableExp returns [Object ret2] : (temp= identifier ) ; public final Object variableExp() throws RecognitionException { Object ret2 = null; @@ -8569,7 +8217,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("VariableExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("VariableExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:661:2: ( (temp= identifier ) ) // ATL_ANTLR3.g:661:4: (temp= identifier ) @@ -8579,15 +8227,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_variableExp3946); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "referredVariable", "VariableDeclaration", "varName", temp, null, "ifmissing", null, false, null); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8607,15 +8256,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end variableExp + // $ANTLR end "variableExp" - // $ANTLR start superExp + // $ANTLR start "superExp" // ATL_ANTLR3.g:671:1: superExp returns [Object ret2] : ( 'super' ) ; public final Object superExp() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("SuperExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SuperExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:672:2: ( ( 'super' ) ) // ATL_ANTLR3.g:672:4: ( 'super' ) @@ -8623,11 +8272,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:672:4: ( 'super' ) // ATL_ANTLR3.g:672:5: 'super' { - match(input,78,FOLLOW_78_in_superExp3980); if (failed) return ret2; + match(input,78,FOLLOW_78_in_superExp3980); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8647,10 +8296,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end superExp + // $ANTLR end "superExp" - // $ANTLR start letExp + // $ANTLR start "letExp" // ATL_ANTLR3.g:682:1: letExp returns [Object ret2] : ( 'let' temp= variableDeclaration 'in' ( (temp= oclExpression ) ) ) ; public final Object letExp() throws RecognitionException { Object ret2 = null; @@ -8658,7 +8307,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("LetExp", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("LetExp", true, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:683:2: ( ( 'let' temp= variableDeclaration 'in' ( (temp= oclExpression ) ) ) ) // ATL_ANTLR3.g:683:4: ( 'let' temp= variableDeclaration 'in' ( (temp= oclExpression ) ) ) @@ -8666,15 +8315,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:683:4: ( 'let' temp= variableDeclaration 'in' ( (temp= oclExpression ) ) ) // ATL_ANTLR3.g:683:5: 'let' temp= variableDeclaration 'in' ( (temp= oclExpression ) ) { - match(input,79,FOLLOW_79_in_letExp4012); if (failed) return ret2; + match(input,79,FOLLOW_79_in_letExp4012); if (state.failed) return ret2; pushFollow(FOLLOW_variableDeclaration_in_letExp4016); temp=variableDeclaration(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "variable", temp); } - match(input,62,FOLLOW_62_in_letExp4020); if (failed) return ret2; + match(input,62,FOLLOW_62_in_letExp4020); if (state.failed) return ret2; // ATL_ANTLR3.g:683:74: ( (temp= oclExpression ) ) // ATL_ANTLR3.g:683:75: (temp= oclExpression ) { @@ -8683,9 +8333,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_letExp4026); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "in_", temp); } @@ -8697,7 +8348,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8717,10 +8368,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end letExp + // $ANTLR end "letExp" - // $ANTLR start variableDeclaration + // $ANTLR start "variableDeclaration" // ATL_ANTLR3.g:693:1: variableDeclaration returns [Object ret2] : (temp= identifier COLON temp= oclType EQ temp= oclExpression ) ; public final Object variableDeclaration() throws RecognitionException { Object ret2 = null; @@ -8728,7 +8379,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("VariableDeclaration", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("VariableDeclaration", false, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:694:2: ( (temp= identifier COLON temp= oclType EQ temp= oclExpression ) ) // ATL_ANTLR3.g:694:4: (temp= identifier COLON temp= oclType EQ temp= oclExpression ) @@ -8738,31 +8389,34 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_variableDeclaration4064); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "varName", temp); } - match(input,COLON,FOLLOW_COLON_in_variableDeclaration4068); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_variableDeclaration4068); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_variableDeclaration4072); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "type", temp); } - match(input,EQ,FOLLOW_EQ_in_variableDeclaration4076); if (failed) return ret2; + match(input,EQ,FOLLOW_EQ_in_variableDeclaration4076); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_variableDeclaration4080); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "initExpression", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8782,10 +8436,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end variableDeclaration + // $ANTLR end "variableDeclaration" - // $ANTLR start enumLiteralExp + // $ANTLR start "enumLiteralExp" // ATL_ANTLR3.g:704:1: enumLiteralExp returns [Object ret2] : ( SHARP temp= identifier ) ; public final Object enumLiteralExp() throws RecognitionException { Object ret2 = null; @@ -8793,7 +8447,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("EnumLiteralExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("EnumLiteralExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:705:2: ( ( SHARP temp= identifier ) ) // ATL_ANTLR3.g:705:4: ( SHARP temp= identifier ) @@ -8801,18 +8455,19 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:705:4: ( SHARP temp= identifier ) // ATL_ANTLR3.g:705:5: SHARP temp= identifier { - match(input,SHARP,FOLLOW_SHARP_in_enumLiteralExp4114); if (failed) return ret2; + match(input,SHARP,FOLLOW_SHARP_in_enumLiteralExp4114); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_enumLiteralExp4118); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -8832,10 +8487,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end enumLiteralExp + // $ANTLR end "enumLiteralExp" - // $ANTLR start collectionExp + // $ANTLR start "collectionExp" // ATL_ANTLR3.g:715:1: collectionExp returns [Object ret2] : ( (ret= bagExp | ret= setExp | ret= orderedSetExp | ret= sequenceExp ) ) ; public final Object collectionExp() throws RecognitionException { Object ret2 = null; @@ -8874,9 +8529,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("716:5: (ret= bagExp | ret= setExp | ret= orderedSetExp | ret= sequenceExp )", 88, 0, input); + new NoViableAltException("", 88, 0, input); throw nvae; } @@ -8887,8 +8542,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_bagExp_in_collectionExp4155); ret=bagExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -8897,8 +8553,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_setExp_in_collectionExp4160); ret=setExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -8907,8 +8564,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_orderedSetExp_in_collectionExp4165); ret=orderedSetExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -8917,8 +8575,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_sequenceExp_in_collectionExp4170); ret=sequenceExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -8928,7 +8587,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -8946,10 +8605,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end collectionExp + // $ANTLR end "collectionExp" - // $ANTLR start bagExp + // $ANTLR start "bagExp" // ATL_ANTLR3.g:724:1: bagExp returns [Object ret2] : ( 'Bag' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) ; public final Object bagExp() throws RecognitionException { Object ret2 = null; @@ -8957,7 +8616,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("BagExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("BagExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:725:2: ( ( 'Bag' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) ) // ATL_ANTLR3.g:725:4: ( 'Bag' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) @@ -8965,8 +8624,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:725:4: ( 'Bag' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) // ATL_ANTLR3.g:725:5: 'Bag' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY { - match(input,80,FOLLOW_80_in_bagExp4203); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_bagExp4205); if (failed) return ret2; + match(input,80,FOLLOW_80_in_bagExp4203); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_bagExp4205); if (state.failed) return ret2; // ATL_ANTLR3.g:725:18: ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? int alt90=2; int LA90_0 = input.LA(1); @@ -8983,9 +8642,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_bagExp4211); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } // ATL_ANTLR3.g:725:72: ( ( ( COMA ) temp= oclExpression ) )* @@ -9009,15 +8669,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:725:74: ( COMA ) // ATL_ANTLR3.g:725:75: COMA { - match(input,COMA,FOLLOW_COMA_in_bagExp4218); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_bagExp4218); if (state.failed) return ret2; } pushFollow(FOLLOW_oclExpression_in_bagExp4223); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } @@ -9041,11 +8702,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_bagExp4233); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_bagExp4233); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -9065,10 +8726,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end bagExp + // $ANTLR end "bagExp" - // $ANTLR start setExp + // $ANTLR start "setExp" // ATL_ANTLR3.g:735:1: setExp returns [Object ret2] : ( 'Set' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) ; public final Object setExp() throws RecognitionException { Object ret2 = null; @@ -9076,7 +8737,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("SetExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SetExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:736:2: ( ( 'Set' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) ) // ATL_ANTLR3.g:736:4: ( 'Set' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) @@ -9084,8 +8745,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:736:4: ( 'Set' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) // ATL_ANTLR3.g:736:5: 'Set' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY { - match(input,81,FOLLOW_81_in_setExp4265); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_setExp4267); if (failed) return ret2; + match(input,81,FOLLOW_81_in_setExp4265); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_setExp4267); if (state.failed) return ret2; // ATL_ANTLR3.g:736:18: ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? int alt92=2; int LA92_0 = input.LA(1); @@ -9102,9 +8763,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_setExp4273); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } // ATL_ANTLR3.g:736:72: ( ( ( COMA ) temp= oclExpression ) )* @@ -9128,15 +8790,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:736:74: ( COMA ) // ATL_ANTLR3.g:736:75: COMA { - match(input,COMA,FOLLOW_COMA_in_setExp4280); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_setExp4280); if (state.failed) return ret2; } pushFollow(FOLLOW_oclExpression_in_setExp4285); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } @@ -9160,11 +8823,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_setExp4295); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_setExp4295); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -9184,10 +8847,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end setExp + // $ANTLR end "setExp" - // $ANTLR start orderedSetExp + // $ANTLR start "orderedSetExp" // ATL_ANTLR3.g:746:1: orderedSetExp returns [Object ret2] : ( 'OrderedSet' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) ; public final Object orderedSetExp() throws RecognitionException { Object ret2 = null; @@ -9195,7 +8858,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("OrderedSetExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OrderedSetExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:747:2: ( ( 'OrderedSet' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) ) // ATL_ANTLR3.g:747:4: ( 'OrderedSet' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) @@ -9203,8 +8866,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:747:4: ( 'OrderedSet' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) // ATL_ANTLR3.g:747:5: 'OrderedSet' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY { - match(input,82,FOLLOW_82_in_orderedSetExp4327); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_orderedSetExp4329); if (failed) return ret2; + match(input,82,FOLLOW_82_in_orderedSetExp4327); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_orderedSetExp4329); if (state.failed) return ret2; // ATL_ANTLR3.g:747:25: ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? int alt94=2; int LA94_0 = input.LA(1); @@ -9221,9 +8884,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_orderedSetExp4335); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } // ATL_ANTLR3.g:747:79: ( ( ( COMA ) temp= oclExpression ) )* @@ -9247,15 +8911,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:747:81: ( COMA ) // ATL_ANTLR3.g:747:82: COMA { - match(input,COMA,FOLLOW_COMA_in_orderedSetExp4342); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_orderedSetExp4342); if (state.failed) return ret2; } pushFollow(FOLLOW_oclExpression_in_orderedSetExp4347); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } @@ -9279,11 +8944,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_orderedSetExp4357); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_orderedSetExp4357); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -9303,10 +8968,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end orderedSetExp + // $ANTLR end "orderedSetExp" - // $ANTLR start sequenceExp + // $ANTLR start "sequenceExp" // ATL_ANTLR3.g:757:1: sequenceExp returns [Object ret2] : ( 'Sequence' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) ; public final Object sequenceExp() throws RecognitionException { Object ret2 = null; @@ -9314,7 +8979,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("SequenceExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SequenceExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:758:2: ( ( 'Sequence' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) ) // ATL_ANTLR3.g:758:4: ( 'Sequence' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) @@ -9322,8 +8987,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:758:4: ( 'Sequence' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY ) // ATL_ANTLR3.g:758:5: 'Sequence' LCURLY ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? RCURLY { - match(input,83,FOLLOW_83_in_sequenceExp4389); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_sequenceExp4391); if (failed) return ret2; + match(input,83,FOLLOW_83_in_sequenceExp4389); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_sequenceExp4391); if (state.failed) return ret2; // ATL_ANTLR3.g:758:23: ( (temp= oclExpression ( ( ( COMA ) temp= oclExpression ) )* ) )? int alt96=2; int LA96_0 = input.LA(1); @@ -9340,9 +9005,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclExpression_in_sequenceExp4397); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } // ATL_ANTLR3.g:758:77: ( ( ( COMA ) temp= oclExpression ) )* @@ -9366,15 +9032,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:758:79: ( COMA ) // ATL_ANTLR3.g:758:80: COMA { - match(input,COMA,FOLLOW_COMA_in_sequenceExp4404); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_sequenceExp4404); if (state.failed) return ret2; } pushFollow(FOLLOW_oclExpression_in_sequenceExp4409); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } @@ -9398,11 +9065,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_sequenceExp4419); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_sequenceExp4419); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -9422,10 +9089,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end sequenceExp + // $ANTLR end "sequenceExp" - // $ANTLR start mapExp + // $ANTLR start "mapExp" // ATL_ANTLR3.g:768:1: mapExp returns [Object ret2] : ( 'Map' LCURLY ( (temp= mapElement ( ( ( COMA ) temp= mapElement ) )* ) )? RCURLY ) ; public final Object mapExp() throws RecognitionException { Object ret2 = null; @@ -9433,7 +9100,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("MapExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("MapExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:769:2: ( ( 'Map' LCURLY ( (temp= mapElement ( ( ( COMA ) temp= mapElement ) )* ) )? RCURLY ) ) // ATL_ANTLR3.g:769:4: ( 'Map' LCURLY ( (temp= mapElement ( ( ( COMA ) temp= mapElement ) )* ) )? RCURLY ) @@ -9441,8 +9108,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:769:4: ( 'Map' LCURLY ( (temp= mapElement ( ( ( COMA ) temp= mapElement ) )* ) )? RCURLY ) // ATL_ANTLR3.g:769:5: 'Map' LCURLY ( (temp= mapElement ( ( ( COMA ) temp= mapElement ) )* ) )? RCURLY { - match(input,84,FOLLOW_84_in_mapExp4451); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_mapExp4453); if (failed) return ret2; + match(input,84,FOLLOW_84_in_mapExp4451); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_mapExp4453); if (state.failed) return ret2; // ATL_ANTLR3.g:769:18: ( (temp= mapElement ( ( ( COMA ) temp= mapElement ) )* ) )? int alt98=2; int LA98_0 = input.LA(1); @@ -9459,9 +9126,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_mapElement_in_mapExp4459); temp=mapElement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } // ATL_ANTLR3.g:769:69: ( ( ( COMA ) temp= mapElement ) )* @@ -9485,15 +9153,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:769:71: ( COMA ) // ATL_ANTLR3.g:769:72: COMA { - match(input,COMA,FOLLOW_COMA_in_mapExp4466); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_mapExp4466); if (state.failed) return ret2; } pushFollow(FOLLOW_mapElement_in_mapExp4471); temp=mapElement(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elements", temp); } @@ -9517,11 +9186,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_mapExp4481); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_mapExp4481); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -9541,10 +9210,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end mapExp + // $ANTLR end "mapExp" - // $ANTLR start mapElement + // $ANTLR start "mapElement" // ATL_ANTLR3.g:779:1: mapElement returns [Object ret2] : ( LPAREN temp= oclExpression COMA temp= oclExpression RPAREN ) ; public final Object mapElement() throws RecognitionException { Object ret2 = null; @@ -9552,7 +9221,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("MapElement", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("MapElement", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:780:2: ( ( LPAREN temp= oclExpression COMA temp= oclExpression RPAREN ) ) // ATL_ANTLR3.g:780:4: ( LPAREN temp= oclExpression COMA temp= oclExpression RPAREN ) @@ -9560,27 +9229,29 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:780:4: ( LPAREN temp= oclExpression COMA temp= oclExpression RPAREN ) // ATL_ANTLR3.g:780:5: LPAREN temp= oclExpression COMA temp= oclExpression RPAREN { - match(input,LPAREN,FOLLOW_LPAREN_in_mapElement4513); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_mapElement4513); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_mapElement4517); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "key", temp); } - match(input,COMA,FOLLOW_COMA_in_mapElement4521); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_mapElement4521); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_mapElement4525); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "value", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_mapElement4529); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_mapElement4529); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -9600,10 +9271,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end mapElement + // $ANTLR end "mapElement" - // $ANTLR start tupleExp + // $ANTLR start "tupleExp" // ATL_ANTLR3.g:790:1: tupleExp returns [Object ret2] : ( 'Tuple' LCURLY ( (temp= tuplePart ( ( ( COMA ) temp= tuplePart ) )* ) )? RCURLY ) ; public final Object tupleExp() throws RecognitionException { Object ret2 = null; @@ -9611,7 +9282,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("TupleExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("TupleExp", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:791:2: ( ( 'Tuple' LCURLY ( (temp= tuplePart ( ( ( COMA ) temp= tuplePart ) )* ) )? RCURLY ) ) // ATL_ANTLR3.g:791:4: ( 'Tuple' LCURLY ( (temp= tuplePart ( ( ( COMA ) temp= tuplePart ) )* ) )? RCURLY ) @@ -9619,8 +9290,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:791:4: ( 'Tuple' LCURLY ( (temp= tuplePart ( ( ( COMA ) temp= tuplePart ) )* ) )? RCURLY ) // ATL_ANTLR3.g:791:5: 'Tuple' LCURLY ( (temp= tuplePart ( ( ( COMA ) temp= tuplePart ) )* ) )? RCURLY { - match(input,85,FOLLOW_85_in_tupleExp4561); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_tupleExp4563); if (failed) return ret2; + match(input,85,FOLLOW_85_in_tupleExp4561); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_tupleExp4563); if (state.failed) return ret2; // ATL_ANTLR3.g:791:20: ( (temp= tuplePart ( ( ( COMA ) temp= tuplePart ) )* ) )? int alt100=2; int LA100_0 = input.LA(1); @@ -9637,9 +9308,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_tuplePart_in_tupleExp4569); temp=tuplePart(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "tuplePart", temp); } // ATL_ANTLR3.g:791:71: ( ( ( COMA ) temp= tuplePart ) )* @@ -9663,15 +9335,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:791:73: ( COMA ) // ATL_ANTLR3.g:791:74: COMA { - match(input,COMA,FOLLOW_COMA_in_tupleExp4576); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_tupleExp4576); if (state.failed) return ret2; } pushFollow(FOLLOW_tuplePart_in_tupleExp4581); temp=tuplePart(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "tuplePart", temp); } @@ -9695,11 +9368,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_tupleExp4591); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_tupleExp4591); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -9719,10 +9392,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end tupleExp + // $ANTLR end "tupleExp" - // $ANTLR start tuplePart + // $ANTLR start "tuplePart" // ATL_ANTLR3.g:801:1: tuplePart returns [Object ret2] : (temp= identifierOrKeyword ( ( COLON temp= oclType ) | () ) EQ temp= oclExpression ) ; public final Object tuplePart() throws RecognitionException { Object ret2 = null; @@ -9730,7 +9403,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("TuplePart", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("TuplePart", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:802:2: ( (temp= identifierOrKeyword ( ( COLON temp= oclType ) | () ) EQ temp= oclExpression ) ) // ATL_ANTLR3.g:802:4: (temp= identifierOrKeyword ( ( COLON temp= oclType ) | () ) EQ temp= oclExpression ) @@ -9740,9 +9413,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifierOrKeyword_in_tuplePart4625); temp=identifierOrKeyword(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "varName", temp); } // ATL_ANTLR3.g:802:62: ( ( COLON temp= oclType ) | () ) @@ -9756,9 +9430,9 @@ public class ATL_ANTLR3Parser extends Parser { alt101=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("802:62: ( ( COLON temp= oclType ) | () )", 101, 0, input); + new NoViableAltException("", 101, 0, input); throw nvae; } @@ -9769,18 +9443,19 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:802:63: ( COLON temp= oclType ) // ATL_ANTLR3.g:802:64: COLON temp= oclType { - match(input,COLON,FOLLOW_COLON_in_tuplePart4631); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_tuplePart4631); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_tuplePart4635); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "type", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -9793,7 +9468,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -9801,18 +9476,19 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,EQ,FOLLOW_EQ_in_tuplePart4649); if (failed) return ret2; + match(input,EQ,FOLLOW_EQ_in_tuplePart4649); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_tuplePart4653); temp=oclExpression(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "initExpression", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -9832,10 +9508,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end tuplePart + // $ANTLR end "tuplePart" - // $ANTLR start oclType + // $ANTLR start "oclType" // ATL_ANTLR3.g:812:1: oclType returns [Object ret2] : ( (ret= oclModelElement | ret= oclAnyType | ret= tupleType | ret= mapType | ret= primitive | ret= collectionType | ret= oclType_abstractContents ) ) ; public final Object oclType() throws RecognitionException { Object ret2 = null; @@ -9896,9 +9572,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("813:5: (ret= oclModelElement | ret= oclAnyType | ret= tupleType | ret= mapType | ret= primitive | ret= collectionType | ret= oclType_abstractContents )", 102, 0, input); + new NoViableAltException("", 102, 0, input); throw nvae; } @@ -9909,8 +9585,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclModelElement_in_oclType4690); ret=oclModelElement(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -9919,8 +9596,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclAnyType_in_oclType4695); ret=oclAnyType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -9929,8 +9607,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_tupleType_in_oclType4700); ret=tupleType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -9939,8 +9618,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_mapType_in_oclType4705); ret=mapType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -9949,8 +9629,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_primitive_in_oclType4710); ret=primitive(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -9959,8 +9640,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_collectionType_in_oclType4715); ret=collectionType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -9969,8 +9651,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclType_abstractContents_in_oclType4720); ret=oclType_abstractContents(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -9980,7 +9663,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -9998,15 +9681,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclType + // $ANTLR end "oclType" - // $ANTLR start oclAnyType + // $ANTLR start "oclAnyType" // ATL_ANTLR3.g:821:1: oclAnyType returns [Object ret2] : ( 'OclAny' ) ; public final Object oclAnyType() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("OclAnyType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OclAnyType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:822:2: ( ( 'OclAny' ) ) // ATL_ANTLR3.g:822:4: ( 'OclAny' ) @@ -10014,11 +9697,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:822:4: ( 'OclAny' ) // ATL_ANTLR3.g:822:5: 'OclAny' { - match(input,87,FOLLOW_87_in_oclAnyType4753); if (failed) return ret2; + match(input,87,FOLLOW_87_in_oclAnyType4753); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10038,10 +9721,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclAnyType + // $ANTLR end "oclAnyType" - // $ANTLR start tupleType + // $ANTLR start "tupleType" // ATL_ANTLR3.g:832:1: tupleType returns [Object ret2] : ( 'TupleType' LPAREN ( (temp= tupleTypeAttribute ( ( ( COMA ) temp= tupleTypeAttribute ) )* ) )? RPAREN ) ; public final Object tupleType() throws RecognitionException { Object ret2 = null; @@ -10049,7 +9732,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("TupleType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("TupleType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:833:2: ( ( 'TupleType' LPAREN ( (temp= tupleTypeAttribute ( ( ( COMA ) temp= tupleTypeAttribute ) )* ) )? RPAREN ) ) // ATL_ANTLR3.g:833:4: ( 'TupleType' LPAREN ( (temp= tupleTypeAttribute ( ( ( COMA ) temp= tupleTypeAttribute ) )* ) )? RPAREN ) @@ -10057,8 +9740,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:833:4: ( 'TupleType' LPAREN ( (temp= tupleTypeAttribute ( ( ( COMA ) temp= tupleTypeAttribute ) )* ) )? RPAREN ) // ATL_ANTLR3.g:833:5: 'TupleType' LPAREN ( (temp= tupleTypeAttribute ( ( ( COMA ) temp= tupleTypeAttribute ) )* ) )? RPAREN { - match(input,88,FOLLOW_88_in_tupleType4785); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_tupleType4787); if (failed) return ret2; + match(input,88,FOLLOW_88_in_tupleType4785); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_tupleType4787); if (state.failed) return ret2; // ATL_ANTLR3.g:833:24: ( (temp= tupleTypeAttribute ( ( ( COMA ) temp= tupleTypeAttribute ) )* ) )? int alt104=2; int LA104_0 = input.LA(1); @@ -10075,9 +9758,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_tupleTypeAttribute_in_tupleType4793); temp=tupleTypeAttribute(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "attributes", temp); } // ATL_ANTLR3.g:833:85: ( ( ( COMA ) temp= tupleTypeAttribute ) )* @@ -10101,15 +9785,16 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:833:87: ( COMA ) // ATL_ANTLR3.g:833:88: COMA { - match(input,COMA,FOLLOW_COMA_in_tupleType4800); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_tupleType4800); if (state.failed) return ret2; } pushFollow(FOLLOW_tupleTypeAttribute_in_tupleType4805); temp=tupleTypeAttribute(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "attributes", temp); } @@ -10133,11 +9818,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RPAREN,FOLLOW_RPAREN_in_tupleType4815); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_tupleType4815); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10157,10 +9842,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end tupleType + // $ANTLR end "tupleType" - // $ANTLR start tupleTypeAttribute + // $ANTLR start "tupleTypeAttribute" // ATL_ANTLR3.g:843:1: tupleTypeAttribute returns [Object ret2] : (temp= identifier COLON temp= oclType ) ; public final Object tupleTypeAttribute() throws RecognitionException { Object ret2 = null; @@ -10168,7 +9853,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("TupleTypeAttribute", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("TupleTypeAttribute", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:844:2: ( (temp= identifier COLON temp= oclType ) ) // ATL_ANTLR3.g:844:4: (temp= identifier COLON temp= oclType ) @@ -10178,23 +9863,25 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_identifier_in_tupleTypeAttribute4849); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } - match(input,COLON,FOLLOW_COLON_in_tupleTypeAttribute4853); if (failed) return ret2; + match(input,COLON,FOLLOW_COLON_in_tupleTypeAttribute4853); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_tupleTypeAttribute4857); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "type", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10214,10 +9901,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end tupleTypeAttribute + // $ANTLR end "tupleTypeAttribute" - // $ANTLR start mapType + // $ANTLR start "mapType" // ATL_ANTLR3.g:854:1: mapType returns [Object ret2] : ( 'Map' LPAREN temp= oclType COMA temp= oclType RPAREN ) ; public final Object mapType() throws RecognitionException { Object ret2 = null; @@ -10225,7 +9912,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("MapType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("MapType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:855:2: ( ( 'Map' LPAREN temp= oclType COMA temp= oclType RPAREN ) ) // ATL_ANTLR3.g:855:4: ( 'Map' LPAREN temp= oclType COMA temp= oclType RPAREN ) @@ -10233,28 +9920,30 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:855:4: ( 'Map' LPAREN temp= oclType COMA temp= oclType RPAREN ) // ATL_ANTLR3.g:855:5: 'Map' LPAREN temp= oclType COMA temp= oclType RPAREN { - match(input,84,FOLLOW_84_in_mapType4891); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_mapType4893); if (failed) return ret2; + match(input,84,FOLLOW_84_in_mapType4891); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_mapType4893); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_mapType4897); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "keyType", temp); } - match(input,COMA,FOLLOW_COMA_in_mapType4901); if (failed) return ret2; + match(input,COMA,FOLLOW_COMA_in_mapType4901); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_mapType4905); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "valueType", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_mapType4909); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_mapType4909); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10274,10 +9963,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end mapType + // $ANTLR end "mapType" - // $ANTLR start primitive + // $ANTLR start "primitive" // ATL_ANTLR3.g:865:1: primitive returns [Object ret2] : ( (ret= numericType | ret= booleanType | ret= stringType ) ) ; public final Object primitive() throws RecognitionException { Object ret2 = null; @@ -10312,9 +10001,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("866:5: (ret= numericType | ret= booleanType | ret= stringType )", 105, 0, input); + new NoViableAltException("", 105, 0, input); throw nvae; } @@ -10325,8 +10014,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_numericType_in_primitive4944); ret=numericType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10335,8 +10025,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_booleanType_in_primitive4949); ret=booleanType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10345,8 +10036,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_stringType_in_primitive4954); ret=stringType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10356,7 +10048,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -10374,10 +10066,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end primitive + // $ANTLR end "primitive" - // $ANTLR start numericType + // $ANTLR start "numericType" // ATL_ANTLR3.g:874:1: numericType returns [Object ret2] : ( (ret= integerType | ret= realType ) ) ; public final Object numericType() throws RecognitionException { Object ret2 = null; @@ -10403,9 +10095,9 @@ public class ATL_ANTLR3Parser extends Parser { alt106=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("875:5: (ret= integerType | ret= realType )", 106, 0, input); + new NoViableAltException("", 106, 0, input); throw nvae; } @@ -10415,8 +10107,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_integerType_in_numericType4990); ret=integerType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10425,8 +10118,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_realType_in_numericType4995); ret=realType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10436,7 +10130,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -10454,15 +10148,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end numericType + // $ANTLR end "numericType" - // $ANTLR start integerType + // $ANTLR start "integerType" // ATL_ANTLR3.g:883:1: integerType returns [Object ret2] : ( 'Integer' ) ; public final Object integerType() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("IntegerType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("IntegerType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:884:2: ( ( 'Integer' ) ) // ATL_ANTLR3.g:884:4: ( 'Integer' ) @@ -10470,11 +10164,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:884:4: ( 'Integer' ) // ATL_ANTLR3.g:884:5: 'Integer' { - match(input,89,FOLLOW_89_in_integerType5028); if (failed) return ret2; + match(input,89,FOLLOW_89_in_integerType5028); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10494,15 +10188,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end integerType + // $ANTLR end "integerType" - // $ANTLR start realType + // $ANTLR start "realType" // ATL_ANTLR3.g:894:1: realType returns [Object ret2] : ( 'Real' ) ; public final Object realType() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("RealType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("RealType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:895:2: ( ( 'Real' ) ) // ATL_ANTLR3.g:895:4: ( 'Real' ) @@ -10510,11 +10204,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:895:4: ( 'Real' ) // ATL_ANTLR3.g:895:5: 'Real' { - match(input,90,FOLLOW_90_in_realType5060); if (failed) return ret2; + match(input,90,FOLLOW_90_in_realType5060); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10534,15 +10228,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end realType + // $ANTLR end "realType" - // $ANTLR start booleanType + // $ANTLR start "booleanType" // ATL_ANTLR3.g:905:1: booleanType returns [Object ret2] : ( 'Boolean' ) ; public final Object booleanType() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("BooleanType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("BooleanType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:906:2: ( ( 'Boolean' ) ) // ATL_ANTLR3.g:906:4: ( 'Boolean' ) @@ -10550,11 +10244,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:906:4: ( 'Boolean' ) // ATL_ANTLR3.g:906:5: 'Boolean' { - match(input,91,FOLLOW_91_in_booleanType5092); if (failed) return ret2; + match(input,91,FOLLOW_91_in_booleanType5092); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10574,15 +10268,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end booleanType + // $ANTLR end "booleanType" - // $ANTLR start stringType + // $ANTLR start "stringType" // ATL_ANTLR3.g:916:1: stringType returns [Object ret2] : ( 'String' ) ; public final Object stringType() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("StringType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("StringType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:917:2: ( ( 'String' ) ) // ATL_ANTLR3.g:917:4: ( 'String' ) @@ -10590,11 +10284,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:917:4: ( 'String' ) // ATL_ANTLR3.g:917:5: 'String' { - match(input,92,FOLLOW_92_in_stringType5124); if (failed) return ret2; + match(input,92,FOLLOW_92_in_stringType5124); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10614,10 +10308,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end stringType + // $ANTLR end "stringType" - // $ANTLR start collectionType + // $ANTLR start "collectionType" // ATL_ANTLR3.g:927:1: collectionType returns [Object ret2] : ( (ret= bagType | ret= setType | ret= orderedSetType | ret= sequenceType | ret= collectionType_abstractContents ) ) ; public final Object collectionType() throws RecognitionException { Object ret2 = null; @@ -10661,9 +10355,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("928:5: (ret= bagType | ret= setType | ret= orderedSetType | ret= sequenceType | ret= collectionType_abstractContents )", 107, 0, input); + new NoViableAltException("", 107, 0, input); throw nvae; } @@ -10674,8 +10368,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_bagType_in_collectionType5159); ret=bagType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10684,8 +10379,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_setType_in_collectionType5164); ret=setType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10694,8 +10390,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_orderedSetType_in_collectionType5169); ret=orderedSetType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10704,8 +10401,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_sequenceType_in_collectionType5174); ret=sequenceType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10714,8 +10412,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_collectionType_abstractContents_in_collectionType5179); ret=collectionType_abstractContents(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -10725,7 +10424,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.addToContext(ret, false); ret2=ret; @@ -10743,10 +10442,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end collectionType + // $ANTLR end "collectionType" - // $ANTLR start bagType + // $ANTLR start "bagType" // ATL_ANTLR3.g:936:1: bagType returns [Object ret2] : ( 'Bag' LPAREN temp= oclType RPAREN ) ; public final Object bagType() throws RecognitionException { Object ret2 = null; @@ -10754,7 +10453,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("BagType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("BagType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:937:2: ( ( 'Bag' LPAREN temp= oclType RPAREN ) ) // ATL_ANTLR3.g:937:4: ( 'Bag' LPAREN temp= oclType RPAREN ) @@ -10762,20 +10461,21 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:937:4: ( 'Bag' LPAREN temp= oclType RPAREN ) // ATL_ANTLR3.g:937:5: 'Bag' LPAREN temp= oclType RPAREN { - match(input,80,FOLLOW_80_in_bagType5212); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_bagType5214); if (failed) return ret2; + match(input,80,FOLLOW_80_in_bagType5212); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_bagType5214); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_bagType5218); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elementType", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_bagType5222); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_bagType5222); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10795,10 +10495,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end bagType + // $ANTLR end "bagType" - // $ANTLR start setType + // $ANTLR start "setType" // ATL_ANTLR3.g:947:1: setType returns [Object ret2] : ( 'Set' LPAREN temp= oclType RPAREN ) ; public final Object setType() throws RecognitionException { Object ret2 = null; @@ -10806,7 +10506,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("SetType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SetType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:948:2: ( ( 'Set' LPAREN temp= oclType RPAREN ) ) // ATL_ANTLR3.g:948:4: ( 'Set' LPAREN temp= oclType RPAREN ) @@ -10814,20 +10514,21 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:948:4: ( 'Set' LPAREN temp= oclType RPAREN ) // ATL_ANTLR3.g:948:5: 'Set' LPAREN temp= oclType RPAREN { - match(input,81,FOLLOW_81_in_setType5254); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_setType5256); if (failed) return ret2; + match(input,81,FOLLOW_81_in_setType5254); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_setType5256); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_setType5260); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elementType", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_setType5264); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_setType5264); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10847,10 +10548,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end setType + // $ANTLR end "setType" - // $ANTLR start orderedSetType + // $ANTLR start "orderedSetType" // ATL_ANTLR3.g:958:1: orderedSetType returns [Object ret2] : ( 'OrderedSet' LPAREN temp= oclType RPAREN ) ; public final Object orderedSetType() throws RecognitionException { Object ret2 = null; @@ -10858,7 +10559,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("OrderedSetType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OrderedSetType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:959:2: ( ( 'OrderedSet' LPAREN temp= oclType RPAREN ) ) // ATL_ANTLR3.g:959:4: ( 'OrderedSet' LPAREN temp= oclType RPAREN ) @@ -10866,20 +10567,21 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:959:4: ( 'OrderedSet' LPAREN temp= oclType RPAREN ) // ATL_ANTLR3.g:959:5: 'OrderedSet' LPAREN temp= oclType RPAREN { - match(input,82,FOLLOW_82_in_orderedSetType5296); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_orderedSetType5298); if (failed) return ret2; + match(input,82,FOLLOW_82_in_orderedSetType5296); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_orderedSetType5298); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_orderedSetType5302); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elementType", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_orderedSetType5306); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_orderedSetType5306); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10899,10 +10601,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end orderedSetType + // $ANTLR end "orderedSetType" - // $ANTLR start sequenceType + // $ANTLR start "sequenceType" // ATL_ANTLR3.g:969:1: sequenceType returns [Object ret2] : ( 'Sequence' LPAREN temp= oclType RPAREN ) ; public final Object sequenceType() throws RecognitionException { Object ret2 = null; @@ -10910,7 +10612,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("SequenceType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("SequenceType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:970:2: ( ( 'Sequence' LPAREN temp= oclType RPAREN ) ) // ATL_ANTLR3.g:970:4: ( 'Sequence' LPAREN temp= oclType RPAREN ) @@ -10918,20 +10620,21 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:970:4: ( 'Sequence' LPAREN temp= oclType RPAREN ) // ATL_ANTLR3.g:970:5: 'Sequence' LPAREN temp= oclType RPAREN { - match(input,83,FOLLOW_83_in_sequenceType5338); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_sequenceType5340); if (failed) return ret2; + match(input,83,FOLLOW_83_in_sequenceType5338); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_sequenceType5340); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_sequenceType5344); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elementType", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_sequenceType5348); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_sequenceType5348); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -10951,10 +10654,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end sequenceType + // $ANTLR end "sequenceType" - // $ANTLR start priority_0 + // $ANTLR start "priority_0" // ATL_ANTLR3.g:980:1: priority_0 returns [Object ret2] : (ret= primary_oclExpression ( ( ( POINT (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] ) ) | ( RARROW (ret= iteratorExp[opName, ret, firstToken] | ret= iterateExp[opName, ret, firstToken] | ret= collectionOperationCallExp[opName, ret, firstToken] ) ) ) )* ) ; public final Object priority_0() throws RecognitionException { Object ret2 = null; @@ -10972,8 +10675,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_primary_oclExpression_in_priority_05382); ret=primary_oclExpression(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; // ATL_ANTLR3.g:981:31: ( ( ( POINT (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] ) ) | ( RARROW (ret= iteratorExp[opName, ret, firstToken] | ret= iterateExp[opName, ret, firstToken] | ret= collectionOperationCallExp[opName, ret, firstToken] ) ) ) )* loop111: do { @@ -11000,9 +10704,9 @@ public class ATL_ANTLR3Parser extends Parser { alt110=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("981:32: ( ( POINT (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] ) ) | ( RARROW (ret= iteratorExp[opName, ret, firstToken] | ret= iterateExp[opName, ret, firstToken] | ret= collectionOperationCallExp[opName, ret, firstToken] ) ) )", 110, 0, input); + new NoViableAltException("", 110, 0, input); throw nvae; } @@ -11013,1150 +10717,22 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:981:33: ( POINT (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] ) ) // ATL_ANTLR3.g:981:34: POINT (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] ) { - match(input,POINT,FOLLOW_POINT_in_priority_05387); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,POINT,FOLLOW_POINT_in_priority_05387); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "."; } // ATL_ANTLR3.g:981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] ) int alt108=2; - switch ( input.LA(1) ) { - case NAME: - { - int LA108_1 = input.LA(2); - - if ( (LA108_1==EOF||(LA108_1>=SEMI && LA108_1<=EQ)||LA108_1==RPAREN||(LA108_1>=RCURLY && LA108_1<=LARROW)||LA108_1==PIPE||(LA108_1>=POINT && LA108_1<=NE)||LA108_1==62||LA108_1==70||(LA108_1>=76 && LA108_1<=77)||(LA108_1>=95 && LA108_1<=100)) ) { - alt108=2; - } - else if ( (LA108_1==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 1, input); - - throw nvae; - } - } - break; - case 43: - { - int LA108_2 = input.LA(2); - - if ( (LA108_2==EOF||(LA108_2>=SEMI && LA108_2<=EQ)||LA108_2==RPAREN||(LA108_2>=RCURLY && LA108_2<=LARROW)||LA108_2==PIPE||(LA108_2>=POINT && LA108_2<=NE)||LA108_2==62||LA108_2==70||(LA108_2>=76 && LA108_2<=77)||(LA108_2>=95 && LA108_2<=100)) ) { - alt108=2; - } - else if ( (LA108_2==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 2, input); - - throw nvae; - } - } - break; - case 44: - { - int LA108_3 = input.LA(2); - - if ( (LA108_3==LPAREN) ) { - alt108=1; - } - else if ( (LA108_3==EOF||(LA108_3>=SEMI && LA108_3<=EQ)||LA108_3==RPAREN||(LA108_3>=RCURLY && LA108_3<=LARROW)||LA108_3==PIPE||(LA108_3>=POINT && LA108_3<=NE)||LA108_3==62||LA108_3==70||(LA108_3>=76 && LA108_3<=77)||(LA108_3>=95 && LA108_3<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 3, input); - - throw nvae; - } - } - break; - case 45: - { - int LA108_4 = input.LA(2); - - if ( (LA108_4==EOF||(LA108_4>=SEMI && LA108_4<=EQ)||LA108_4==RPAREN||(LA108_4>=RCURLY && LA108_4<=LARROW)||LA108_4==PIPE||(LA108_4>=POINT && LA108_4<=NE)||LA108_4==62||LA108_4==70||(LA108_4>=76 && LA108_4<=77)||(LA108_4>=95 && LA108_4<=100)) ) { - alt108=2; - } - else if ( (LA108_4==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 4, input); - - throw nvae; - } - } - break; - case 46: - { - int LA108_5 = input.LA(2); - - if ( (LA108_5==EOF||(LA108_5>=SEMI && LA108_5<=EQ)||LA108_5==RPAREN||(LA108_5>=RCURLY && LA108_5<=LARROW)||LA108_5==PIPE||(LA108_5>=POINT && LA108_5<=NE)||LA108_5==62||LA108_5==70||(LA108_5>=76 && LA108_5<=77)||(LA108_5>=95 && LA108_5<=100)) ) { - alt108=2; - } - else if ( (LA108_5==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 5, input); - - throw nvae; - } - } - break; - case 47: - { - int LA108_6 = input.LA(2); - - if ( (LA108_6==EOF||(LA108_6>=SEMI && LA108_6<=EQ)||LA108_6==RPAREN||(LA108_6>=RCURLY && LA108_6<=LARROW)||LA108_6==PIPE||(LA108_6>=POINT && LA108_6<=NE)||LA108_6==62||LA108_6==70||(LA108_6>=76 && LA108_6<=77)||(LA108_6>=95 && LA108_6<=100)) ) { - alt108=2; - } - else if ( (LA108_6==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 6, input); - - throw nvae; - } - } - break; - case 48: - { - int LA108_7 = input.LA(2); - - if ( (LA108_7==LPAREN) ) { - alt108=1; - } - else if ( (LA108_7==EOF||(LA108_7>=SEMI && LA108_7<=EQ)||LA108_7==RPAREN||(LA108_7>=RCURLY && LA108_7<=LARROW)||LA108_7==PIPE||(LA108_7>=POINT && LA108_7<=NE)||LA108_7==62||LA108_7==70||(LA108_7>=76 && LA108_7<=77)||(LA108_7>=95 && LA108_7<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 7, input); - - throw nvae; - } - } - break; - case 49: - { - int LA108_8 = input.LA(2); - - if ( (LA108_8==LPAREN) ) { - alt108=1; - } - else if ( (LA108_8==EOF||(LA108_8>=SEMI && LA108_8<=EQ)||LA108_8==RPAREN||(LA108_8>=RCURLY && LA108_8<=LARROW)||LA108_8==PIPE||(LA108_8>=POINT && LA108_8<=NE)||LA108_8==62||LA108_8==70||(LA108_8>=76 && LA108_8<=77)||(LA108_8>=95 && LA108_8<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 8, input); - - throw nvae; - } - } - break; - case 50: - { - int LA108_9 = input.LA(2); - - if ( (LA108_9==LPAREN) ) { - alt108=1; - } - else if ( (LA108_9==EOF||(LA108_9>=SEMI && LA108_9<=EQ)||LA108_9==RPAREN||(LA108_9>=RCURLY && LA108_9<=LARROW)||LA108_9==PIPE||(LA108_9>=POINT && LA108_9<=NE)||LA108_9==62||LA108_9==70||(LA108_9>=76 && LA108_9<=77)||(LA108_9>=95 && LA108_9<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 9, input); - - throw nvae; - } - } - break; - case 51: - { - int LA108_10 = input.LA(2); - - if ( (LA108_10==EOF||(LA108_10>=SEMI && LA108_10<=EQ)||LA108_10==RPAREN||(LA108_10>=RCURLY && LA108_10<=LARROW)||LA108_10==PIPE||(LA108_10>=POINT && LA108_10<=NE)||LA108_10==62||LA108_10==70||(LA108_10>=76 && LA108_10<=77)||(LA108_10>=95 && LA108_10<=100)) ) { - alt108=2; - } - else if ( (LA108_10==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 10, input); - - throw nvae; - } - } - break; - case 52: - { - int LA108_11 = input.LA(2); - - if ( (LA108_11==EOF||(LA108_11>=SEMI && LA108_11<=EQ)||LA108_11==RPAREN||(LA108_11>=RCURLY && LA108_11<=LARROW)||LA108_11==PIPE||(LA108_11>=POINT && LA108_11<=NE)||LA108_11==62||LA108_11==70||(LA108_11>=76 && LA108_11<=77)||(LA108_11>=95 && LA108_11<=100)) ) { - alt108=2; - } - else if ( (LA108_11==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 11, input); - - throw nvae; - } - } - break; - case 53: - { - int LA108_12 = input.LA(2); - - if ( (LA108_12==LPAREN) ) { - alt108=1; - } - else if ( (LA108_12==EOF||(LA108_12>=SEMI && LA108_12<=EQ)||LA108_12==RPAREN||(LA108_12>=RCURLY && LA108_12<=LARROW)||LA108_12==PIPE||(LA108_12>=POINT && LA108_12<=NE)||LA108_12==62||LA108_12==70||(LA108_12>=76 && LA108_12<=77)||(LA108_12>=95 && LA108_12<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 12, input); - - throw nvae; - } - } - break; - case 54: - { - int LA108_13 = input.LA(2); - - if ( (LA108_13==LPAREN) ) { - alt108=1; - } - else if ( (LA108_13==EOF||(LA108_13>=SEMI && LA108_13<=EQ)||LA108_13==RPAREN||(LA108_13>=RCURLY && LA108_13<=LARROW)||LA108_13==PIPE||(LA108_13>=POINT && LA108_13<=NE)||LA108_13==62||LA108_13==70||(LA108_13>=76 && LA108_13<=77)||(LA108_13>=95 && LA108_13<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 13, input); - - throw nvae; - } - } - break; - case 55: - { - int LA108_14 = input.LA(2); - - if ( (LA108_14==LPAREN) ) { - alt108=1; - } - else if ( (LA108_14==EOF||(LA108_14>=SEMI && LA108_14<=EQ)||LA108_14==RPAREN||(LA108_14>=RCURLY && LA108_14<=LARROW)||LA108_14==PIPE||(LA108_14>=POINT && LA108_14<=NE)||LA108_14==62||LA108_14==70||(LA108_14>=76 && LA108_14<=77)||(LA108_14>=95 && LA108_14<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 14, input); - - throw nvae; - } - } - break; - case 56: - { - int LA108_15 = input.LA(2); - - if ( (LA108_15==EOF||(LA108_15>=SEMI && LA108_15<=EQ)||LA108_15==RPAREN||(LA108_15>=RCURLY && LA108_15<=LARROW)||LA108_15==PIPE||(LA108_15>=POINT && LA108_15<=NE)||LA108_15==62||LA108_15==70||(LA108_15>=76 && LA108_15<=77)||(LA108_15>=95 && LA108_15<=100)) ) { - alt108=2; - } - else if ( (LA108_15==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 15, input); - - throw nvae; - } - } - break; - case 57: - { - int LA108_16 = input.LA(2); - - if ( (LA108_16==LPAREN) ) { - alt108=1; - } - else if ( (LA108_16==EOF||(LA108_16>=SEMI && LA108_16<=EQ)||LA108_16==RPAREN||(LA108_16>=RCURLY && LA108_16<=LARROW)||LA108_16==PIPE||(LA108_16>=POINT && LA108_16<=NE)||LA108_16==62||LA108_16==70||(LA108_16>=76 && LA108_16<=77)||(LA108_16>=95 && LA108_16<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 16, input); - - throw nvae; - } - } - break; - case 58: - { - int LA108_17 = input.LA(2); - - if ( (LA108_17==LPAREN) ) { - alt108=1; - } - else if ( (LA108_17==EOF||(LA108_17>=SEMI && LA108_17<=EQ)||LA108_17==RPAREN||(LA108_17>=RCURLY && LA108_17<=LARROW)||LA108_17==PIPE||(LA108_17>=POINT && LA108_17<=NE)||LA108_17==62||LA108_17==70||(LA108_17>=76 && LA108_17<=77)||(LA108_17>=95 && LA108_17<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 17, input); - - throw nvae; - } - } - break; - case 59: - { - int LA108_18 = input.LA(2); - - if ( (LA108_18==LPAREN) ) { - alt108=1; - } - else if ( (LA108_18==EOF||(LA108_18>=SEMI && LA108_18<=EQ)||LA108_18==RPAREN||(LA108_18>=RCURLY && LA108_18<=LARROW)||LA108_18==PIPE||(LA108_18>=POINT && LA108_18<=NE)||LA108_18==62||LA108_18==70||(LA108_18>=76 && LA108_18<=77)||(LA108_18>=95 && LA108_18<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 18, input); - - throw nvae; - } - } - break; - case 60: - { - int LA108_19 = input.LA(2); - - if ( (LA108_19==EOF||(LA108_19>=SEMI && LA108_19<=EQ)||LA108_19==RPAREN||(LA108_19>=RCURLY && LA108_19<=LARROW)||LA108_19==PIPE||(LA108_19>=POINT && LA108_19<=NE)||LA108_19==62||LA108_19==70||(LA108_19>=76 && LA108_19<=77)||(LA108_19>=95 && LA108_19<=100)) ) { - alt108=2; - } - else if ( (LA108_19==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 19, input); - - throw nvae; - } - } - break; - case 61: - { - int LA108_20 = input.LA(2); - - if ( (LA108_20==LPAREN) ) { - alt108=1; - } - else if ( (LA108_20==EOF||(LA108_20>=SEMI && LA108_20<=EQ)||LA108_20==RPAREN||(LA108_20>=RCURLY && LA108_20<=LARROW)||LA108_20==PIPE||(LA108_20>=POINT && LA108_20<=NE)||LA108_20==62||LA108_20==70||(LA108_20>=76 && LA108_20<=77)||(LA108_20>=95 && LA108_20<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 20, input); - - throw nvae; - } - } - break; - case 62: - { - int LA108_21 = input.LA(2); - - if ( (LA108_21==LPAREN) ) { - alt108=1; - } - else if ( (LA108_21==EOF||(LA108_21>=SEMI && LA108_21<=EQ)||LA108_21==RPAREN||(LA108_21>=RCURLY && LA108_21<=LARROW)||LA108_21==PIPE||(LA108_21>=POINT && LA108_21<=NE)||LA108_21==62||LA108_21==70||(LA108_21>=76 && LA108_21<=77)||(LA108_21>=95 && LA108_21<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 21, input); - - throw nvae; - } - } - break; - case 63: - { - int LA108_22 = input.LA(2); - - if ( (LA108_22==LPAREN) ) { - alt108=1; - } - else if ( (LA108_22==EOF||(LA108_22>=SEMI && LA108_22<=EQ)||LA108_22==RPAREN||(LA108_22>=RCURLY && LA108_22<=LARROW)||LA108_22==PIPE||(LA108_22>=POINT && LA108_22<=NE)||LA108_22==62||LA108_22==70||(LA108_22>=76 && LA108_22<=77)||(LA108_22>=95 && LA108_22<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 22, input); - - throw nvae; - } - } - break; - case 64: - { - int LA108_23 = input.LA(2); - - if ( (LA108_23==EOF||(LA108_23>=SEMI && LA108_23<=EQ)||LA108_23==RPAREN||(LA108_23>=RCURLY && LA108_23<=LARROW)||LA108_23==PIPE||(LA108_23>=POINT && LA108_23<=NE)||LA108_23==62||LA108_23==70||(LA108_23>=76 && LA108_23<=77)||(LA108_23>=95 && LA108_23<=100)) ) { - alt108=2; - } - else if ( (LA108_23==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 23, input); - - throw nvae; - } - } - break; - case 65: - { - int LA108_24 = input.LA(2); - - if ( (LA108_24==EOF||(LA108_24>=SEMI && LA108_24<=EQ)||LA108_24==RPAREN||(LA108_24>=RCURLY && LA108_24<=LARROW)||LA108_24==PIPE||(LA108_24>=POINT && LA108_24<=NE)||LA108_24==62||LA108_24==70||(LA108_24>=76 && LA108_24<=77)||(LA108_24>=95 && LA108_24<=100)) ) { - alt108=2; - } - else if ( (LA108_24==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 24, input); - - throw nvae; - } - } - break; - case 66: - { - int LA108_25 = input.LA(2); - - if ( (LA108_25==LPAREN) ) { - alt108=1; - } - else if ( (LA108_25==EOF||(LA108_25>=SEMI && LA108_25<=EQ)||LA108_25==RPAREN||(LA108_25>=RCURLY && LA108_25<=LARROW)||LA108_25==PIPE||(LA108_25>=POINT && LA108_25<=NE)||LA108_25==62||LA108_25==70||(LA108_25>=76 && LA108_25<=77)||(LA108_25>=95 && LA108_25<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 25, input); - - throw nvae; - } - } - break; - case 67: - { - int LA108_26 = input.LA(2); - - if ( (LA108_26==EOF||(LA108_26>=SEMI && LA108_26<=EQ)||LA108_26==RPAREN||(LA108_26>=RCURLY && LA108_26<=LARROW)||LA108_26==PIPE||(LA108_26>=POINT && LA108_26<=NE)||LA108_26==62||LA108_26==70||(LA108_26>=76 && LA108_26<=77)||(LA108_26>=95 && LA108_26<=100)) ) { - alt108=2; - } - else if ( (LA108_26==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 26, input); - - throw nvae; - } - } - break; - case 68: - { - int LA108_27 = input.LA(2); - - if ( (LA108_27==EOF||(LA108_27>=SEMI && LA108_27<=EQ)||LA108_27==RPAREN||(LA108_27>=RCURLY && LA108_27<=LARROW)||LA108_27==PIPE||(LA108_27>=POINT && LA108_27<=NE)||LA108_27==62||LA108_27==70||(LA108_27>=76 && LA108_27<=77)||(LA108_27>=95 && LA108_27<=100)) ) { - alt108=2; - } - else if ( (LA108_27==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 27, input); - - throw nvae; - } - } - break; - case 69: - { - int LA108_28 = input.LA(2); - - if ( (LA108_28==EOF||(LA108_28>=SEMI && LA108_28<=EQ)||LA108_28==RPAREN||(LA108_28>=RCURLY && LA108_28<=LARROW)||LA108_28==PIPE||(LA108_28>=POINT && LA108_28<=NE)||LA108_28==62||LA108_28==70||(LA108_28>=76 && LA108_28<=77)||(LA108_28>=95 && LA108_28<=100)) ) { - alt108=2; - } - else if ( (LA108_28==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 28, input); - - throw nvae; - } - } - break; - case 70: - { - int LA108_29 = input.LA(2); - - if ( (LA108_29==LPAREN) ) { - alt108=1; - } - else if ( (LA108_29==EOF||(LA108_29>=SEMI && LA108_29<=EQ)||LA108_29==RPAREN||(LA108_29>=RCURLY && LA108_29<=LARROW)||LA108_29==PIPE||(LA108_29>=POINT && LA108_29<=NE)||LA108_29==62||LA108_29==70||(LA108_29>=76 && LA108_29<=77)||(LA108_29>=95 && LA108_29<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 29, input); - - throw nvae; - } - } - break; - case 71: - { - int LA108_30 = input.LA(2); - - if ( (LA108_30==EOF||(LA108_30>=SEMI && LA108_30<=EQ)||LA108_30==RPAREN||(LA108_30>=RCURLY && LA108_30<=LARROW)||LA108_30==PIPE||(LA108_30>=POINT && LA108_30<=NE)||LA108_30==62||LA108_30==70||(LA108_30>=76 && LA108_30<=77)||(LA108_30>=95 && LA108_30<=100)) ) { - alt108=2; - } - else if ( (LA108_30==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 30, input); - - throw nvae; - } - } - break; - case 72: - { - int LA108_31 = input.LA(2); - - if ( (LA108_31==EOF||(LA108_31>=SEMI && LA108_31<=EQ)||LA108_31==RPAREN||(LA108_31>=RCURLY && LA108_31<=LARROW)||LA108_31==PIPE||(LA108_31>=POINT && LA108_31<=NE)||LA108_31==62||LA108_31==70||(LA108_31>=76 && LA108_31<=77)||(LA108_31>=95 && LA108_31<=100)) ) { - alt108=2; - } - else if ( (LA108_31==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 31, input); - - throw nvae; - } - } - break; - case 73: - { - int LA108_32 = input.LA(2); - - if ( (LA108_32==EOF||(LA108_32>=SEMI && LA108_32<=EQ)||LA108_32==RPAREN||(LA108_32>=RCURLY && LA108_32<=LARROW)||LA108_32==PIPE||(LA108_32>=POINT && LA108_32<=NE)||LA108_32==62||LA108_32==70||(LA108_32>=76 && LA108_32<=77)||(LA108_32>=95 && LA108_32<=100)) ) { - alt108=2; - } - else if ( (LA108_32==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 32, input); - - throw nvae; - } - } - break; - case 74: - { - int LA108_33 = input.LA(2); - - if ( (LA108_33==LPAREN) ) { - alt108=1; - } - else if ( (LA108_33==EOF||(LA108_33>=SEMI && LA108_33<=EQ)||LA108_33==RPAREN||(LA108_33>=RCURLY && LA108_33<=LARROW)||LA108_33==PIPE||(LA108_33>=POINT && LA108_33<=NE)||LA108_33==62||LA108_33==70||(LA108_33>=76 && LA108_33<=77)||(LA108_33>=95 && LA108_33<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 33, input); - - throw nvae; - } - } - break; - case 75: - { - int LA108_34 = input.LA(2); - - if ( (LA108_34==EOF||(LA108_34>=SEMI && LA108_34<=EQ)||LA108_34==RPAREN||(LA108_34>=RCURLY && LA108_34<=LARROW)||LA108_34==PIPE||(LA108_34>=POINT && LA108_34<=NE)||LA108_34==62||LA108_34==70||(LA108_34>=76 && LA108_34<=77)||(LA108_34>=95 && LA108_34<=100)) ) { - alt108=2; - } - else if ( (LA108_34==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 34, input); - - throw nvae; - } - } - break; - case 76: - { - int LA108_35 = input.LA(2); - - if ( (LA108_35==EOF||(LA108_35>=SEMI && LA108_35<=EQ)||LA108_35==RPAREN||(LA108_35>=RCURLY && LA108_35<=LARROW)||LA108_35==PIPE||(LA108_35>=POINT && LA108_35<=NE)||LA108_35==62||LA108_35==70||(LA108_35>=76 && LA108_35<=77)||(LA108_35>=95 && LA108_35<=100)) ) { - alt108=2; - } - else if ( (LA108_35==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 35, input); - - throw nvae; - } - } - break; - case 77: - { - int LA108_36 = input.LA(2); - - if ( (LA108_36==EOF||(LA108_36>=SEMI && LA108_36<=EQ)||LA108_36==RPAREN||(LA108_36>=RCURLY && LA108_36<=LARROW)||LA108_36==PIPE||(LA108_36>=POINT && LA108_36<=NE)||LA108_36==62||LA108_36==70||(LA108_36>=76 && LA108_36<=77)||(LA108_36>=95 && LA108_36<=100)) ) { - alt108=2; - } - else if ( (LA108_36==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 36, input); - - throw nvae; - } - } - break; - case 78: - { - int LA108_37 = input.LA(2); - - if ( (LA108_37==LPAREN) ) { - alt108=1; - } - else if ( (LA108_37==EOF||(LA108_37>=SEMI && LA108_37<=EQ)||LA108_37==RPAREN||(LA108_37>=RCURLY && LA108_37<=LARROW)||LA108_37==PIPE||(LA108_37>=POINT && LA108_37<=NE)||LA108_37==62||LA108_37==70||(LA108_37>=76 && LA108_37<=77)||(LA108_37>=95 && LA108_37<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 37, input); - - throw nvae; - } - } - break; - case 79: - { - int LA108_38 = input.LA(2); - - if ( (LA108_38==EOF||(LA108_38>=SEMI && LA108_38<=EQ)||LA108_38==RPAREN||(LA108_38>=RCURLY && LA108_38<=LARROW)||LA108_38==PIPE||(LA108_38>=POINT && LA108_38<=NE)||LA108_38==62||LA108_38==70||(LA108_38>=76 && LA108_38<=77)||(LA108_38>=95 && LA108_38<=100)) ) { - alt108=2; - } - else if ( (LA108_38==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 38, input); - - throw nvae; - } - } - break; - case 80: - { - int LA108_39 = input.LA(2); - - if ( (LA108_39==EOF||(LA108_39>=SEMI && LA108_39<=EQ)||LA108_39==RPAREN||(LA108_39>=RCURLY && LA108_39<=LARROW)||LA108_39==PIPE||(LA108_39>=POINT && LA108_39<=NE)||LA108_39==62||LA108_39==70||(LA108_39>=76 && LA108_39<=77)||(LA108_39>=95 && LA108_39<=100)) ) { - alt108=2; - } - else if ( (LA108_39==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 39, input); - - throw nvae; - } - } - break; - case 81: - { - int LA108_40 = input.LA(2); - - if ( (LA108_40==EOF||(LA108_40>=SEMI && LA108_40<=EQ)||LA108_40==RPAREN||(LA108_40>=RCURLY && LA108_40<=LARROW)||LA108_40==PIPE||(LA108_40>=POINT && LA108_40<=NE)||LA108_40==62||LA108_40==70||(LA108_40>=76 && LA108_40<=77)||(LA108_40>=95 && LA108_40<=100)) ) { - alt108=2; - } - else if ( (LA108_40==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 40, input); - - throw nvae; - } - } - break; - case 82: - { - int LA108_41 = input.LA(2); - - if ( (LA108_41==EOF||(LA108_41>=SEMI && LA108_41<=EQ)||LA108_41==RPAREN||(LA108_41>=RCURLY && LA108_41<=LARROW)||LA108_41==PIPE||(LA108_41>=POINT && LA108_41<=NE)||LA108_41==62||LA108_41==70||(LA108_41>=76 && LA108_41<=77)||(LA108_41>=95 && LA108_41<=100)) ) { - alt108=2; - } - else if ( (LA108_41==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 41, input); - - throw nvae; - } - } - break; - case 83: - { - int LA108_42 = input.LA(2); - - if ( (LA108_42==LPAREN) ) { - alt108=1; - } - else if ( (LA108_42==EOF||(LA108_42>=SEMI && LA108_42<=EQ)||LA108_42==RPAREN||(LA108_42>=RCURLY && LA108_42<=LARROW)||LA108_42==PIPE||(LA108_42>=POINT && LA108_42<=NE)||LA108_42==62||LA108_42==70||(LA108_42>=76 && LA108_42<=77)||(LA108_42>=95 && LA108_42<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 42, input); - - throw nvae; - } - } - break; - case 84: - { - int LA108_43 = input.LA(2); - - if ( (LA108_43==LPAREN) ) { - alt108=1; - } - else if ( (LA108_43==EOF||(LA108_43>=SEMI && LA108_43<=EQ)||LA108_43==RPAREN||(LA108_43>=RCURLY && LA108_43<=LARROW)||LA108_43==PIPE||(LA108_43>=POINT && LA108_43<=NE)||LA108_43==62||LA108_43==70||(LA108_43>=76 && LA108_43<=77)||(LA108_43>=95 && LA108_43<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 43, input); - - throw nvae; - } - } - break; - case 85: - { - int LA108_44 = input.LA(2); - - if ( (LA108_44==LPAREN) ) { - alt108=1; - } - else if ( (LA108_44==EOF||(LA108_44>=SEMI && LA108_44<=EQ)||LA108_44==RPAREN||(LA108_44>=RCURLY && LA108_44<=LARROW)||LA108_44==PIPE||(LA108_44>=POINT && LA108_44<=NE)||LA108_44==62||LA108_44==70||(LA108_44>=76 && LA108_44<=77)||(LA108_44>=95 && LA108_44<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 44, input); - - throw nvae; - } - } - break; - case 86: - { - int LA108_45 = input.LA(2); - - if ( (LA108_45==EOF||(LA108_45>=SEMI && LA108_45<=EQ)||LA108_45==RPAREN||(LA108_45>=RCURLY && LA108_45<=LARROW)||LA108_45==PIPE||(LA108_45>=POINT && LA108_45<=NE)||LA108_45==62||LA108_45==70||(LA108_45>=76 && LA108_45<=77)||(LA108_45>=95 && LA108_45<=100)) ) { - alt108=2; - } - else if ( (LA108_45==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 45, input); - - throw nvae; - } - } - break; - case 87: - { - int LA108_46 = input.LA(2); - - if ( (LA108_46==LPAREN) ) { - alt108=1; - } - else if ( (LA108_46==EOF||(LA108_46>=SEMI && LA108_46<=EQ)||LA108_46==RPAREN||(LA108_46>=RCURLY && LA108_46<=LARROW)||LA108_46==PIPE||(LA108_46>=POINT && LA108_46<=NE)||LA108_46==62||LA108_46==70||(LA108_46>=76 && LA108_46<=77)||(LA108_46>=95 && LA108_46<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 46, input); - - throw nvae; - } - } - break; - case 88: - { - int LA108_47 = input.LA(2); - - if ( (LA108_47==LPAREN) ) { - alt108=1; - } - else if ( (LA108_47==EOF||(LA108_47>=SEMI && LA108_47<=EQ)||LA108_47==RPAREN||(LA108_47>=RCURLY && LA108_47<=LARROW)||LA108_47==PIPE||(LA108_47>=POINT && LA108_47<=NE)||LA108_47==62||LA108_47==70||(LA108_47>=76 && LA108_47<=77)||(LA108_47>=95 && LA108_47<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 47, input); - - throw nvae; - } - } - break; - case 89: - { - int LA108_48 = input.LA(2); - - if ( (LA108_48==LPAREN) ) { - alt108=1; - } - else if ( (LA108_48==EOF||(LA108_48>=SEMI && LA108_48<=EQ)||LA108_48==RPAREN||(LA108_48>=RCURLY && LA108_48<=LARROW)||LA108_48==PIPE||(LA108_48>=POINT && LA108_48<=NE)||LA108_48==62||LA108_48==70||(LA108_48>=76 && LA108_48<=77)||(LA108_48>=95 && LA108_48<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 48, input); - - throw nvae; - } - } - break; - case 90: - { - int LA108_49 = input.LA(2); - - if ( (LA108_49==EOF||(LA108_49>=SEMI && LA108_49<=EQ)||LA108_49==RPAREN||(LA108_49>=RCURLY && LA108_49<=LARROW)||LA108_49==PIPE||(LA108_49>=POINT && LA108_49<=NE)||LA108_49==62||LA108_49==70||(LA108_49>=76 && LA108_49<=77)||(LA108_49>=95 && LA108_49<=100)) ) { - alt108=2; - } - else if ( (LA108_49==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 49, input); - - throw nvae; - } - } - break; - case 91: - { - int LA108_50 = input.LA(2); - - if ( (LA108_50==LPAREN) ) { - alt108=1; - } - else if ( (LA108_50==EOF||(LA108_50>=SEMI && LA108_50<=EQ)||LA108_50==RPAREN||(LA108_50>=RCURLY && LA108_50<=LARROW)||LA108_50==PIPE||(LA108_50>=POINT && LA108_50<=NE)||LA108_50==62||LA108_50==70||(LA108_50>=76 && LA108_50<=77)||(LA108_50>=95 && LA108_50<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 50, input); - - throw nvae; - } - } - break; - case 92: - { - int LA108_51 = input.LA(2); - - if ( (LA108_51==LPAREN) ) { - alt108=1; - } - else if ( (LA108_51==EOF||(LA108_51>=SEMI && LA108_51<=EQ)||LA108_51==RPAREN||(LA108_51>=RCURLY && LA108_51<=LARROW)||LA108_51==PIPE||(LA108_51>=POINT && LA108_51<=NE)||LA108_51==62||LA108_51==70||(LA108_51>=76 && LA108_51<=77)||(LA108_51>=95 && LA108_51<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 51, input); - - throw nvae; - } - } - break; - case 93: - { - int LA108_52 = input.LA(2); - - if ( (LA108_52==LPAREN) ) { - alt108=1; - } - else if ( (LA108_52==EOF||(LA108_52>=SEMI && LA108_52<=EQ)||LA108_52==RPAREN||(LA108_52>=RCURLY && LA108_52<=LARROW)||LA108_52==PIPE||(LA108_52>=POINT && LA108_52<=NE)||LA108_52==62||LA108_52==70||(LA108_52>=76 && LA108_52<=77)||(LA108_52>=95 && LA108_52<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 52, input); - - throw nvae; - } - } - break; - case 94: - { - int LA108_53 = input.LA(2); - - if ( (LA108_53==EOF||(LA108_53>=SEMI && LA108_53<=EQ)||LA108_53==RPAREN||(LA108_53>=RCURLY && LA108_53<=LARROW)||LA108_53==PIPE||(LA108_53>=POINT && LA108_53<=NE)||LA108_53==62||LA108_53==70||(LA108_53>=76 && LA108_53<=77)||(LA108_53>=95 && LA108_53<=100)) ) { - alt108=2; - } - else if ( (LA108_53==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 53, input); - - throw nvae; - } - } - break; - case 95: - { - int LA108_54 = input.LA(2); - - if ( (LA108_54==LPAREN) ) { - alt108=1; - } - else if ( (LA108_54==EOF||(LA108_54>=SEMI && LA108_54<=EQ)||LA108_54==RPAREN||(LA108_54>=RCURLY && LA108_54<=LARROW)||LA108_54==PIPE||(LA108_54>=POINT && LA108_54<=NE)||LA108_54==62||LA108_54==70||(LA108_54>=76 && LA108_54<=77)||(LA108_54>=95 && LA108_54<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 54, input); - - throw nvae; - } - } - break; - case 96: - { - int LA108_55 = input.LA(2); - - if ( (LA108_55==LPAREN) ) { - alt108=1; - } - else if ( (LA108_55==EOF||(LA108_55>=SEMI && LA108_55<=EQ)||LA108_55==RPAREN||(LA108_55>=RCURLY && LA108_55<=LARROW)||LA108_55==PIPE||(LA108_55>=POINT && LA108_55<=NE)||LA108_55==62||LA108_55==70||(LA108_55>=76 && LA108_55<=77)||(LA108_55>=95 && LA108_55<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 55, input); - - throw nvae; - } - } - break; - case 97: - { - int LA108_56 = input.LA(2); - - if ( (LA108_56==LPAREN) ) { - alt108=1; - } - else if ( (LA108_56==EOF||(LA108_56>=SEMI && LA108_56<=EQ)||LA108_56==RPAREN||(LA108_56>=RCURLY && LA108_56<=LARROW)||LA108_56==PIPE||(LA108_56>=POINT && LA108_56<=NE)||LA108_56==62||LA108_56==70||(LA108_56>=76 && LA108_56<=77)||(LA108_56>=95 && LA108_56<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 56, input); - - throw nvae; - } - } - break; - case 98: - { - int LA108_57 = input.LA(2); - - if ( (LA108_57==EOF||(LA108_57>=SEMI && LA108_57<=EQ)||LA108_57==RPAREN||(LA108_57>=RCURLY && LA108_57<=LARROW)||LA108_57==PIPE||(LA108_57>=POINT && LA108_57<=NE)||LA108_57==62||LA108_57==70||(LA108_57>=76 && LA108_57<=77)||(LA108_57>=95 && LA108_57<=100)) ) { - alt108=2; - } - else if ( (LA108_57==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 57, input); - - throw nvae; - } - } - break; - case 99: - { - int LA108_58 = input.LA(2); - - if ( (LA108_58==EOF||(LA108_58>=SEMI && LA108_58<=EQ)||LA108_58==RPAREN||(LA108_58>=RCURLY && LA108_58<=LARROW)||LA108_58==PIPE||(LA108_58>=POINT && LA108_58<=NE)||LA108_58==62||LA108_58==70||(LA108_58>=76 && LA108_58<=77)||(LA108_58>=95 && LA108_58<=100)) ) { - alt108=2; - } - else if ( (LA108_58==LPAREN) ) { - alt108=1; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 58, input); - - throw nvae; - } - } - break; - case 100: - { - int LA108_59 = input.LA(2); - - if ( (LA108_59==LPAREN) ) { - alt108=1; - } - else if ( (LA108_59==EOF||(LA108_59>=SEMI && LA108_59<=EQ)||LA108_59==RPAREN||(LA108_59>=RCURLY && LA108_59<=LARROW)||LA108_59==PIPE||(LA108_59>=POINT && LA108_59<=NE)||LA108_59==62||LA108_59==70||(LA108_59>=76 && LA108_59<=77)||(LA108_59>=95 && LA108_59<=100)) ) { - alt108=2; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 59, input); - - throw nvae; - } - } - break; - default: - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )", 108, 0, input); - - throw nvae; - } - + alt108 = dfa108.predict(input); switch (alt108) { case 1 : // ATL_ANTLR3.g:981:57: ret= operationCallExp[opName, ret, firstToken] { pushFollow(FOLLOW_operationCallExp_in_priority_05394); - ret=operationCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operationCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; } break; @@ -12164,9 +10740,10 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:981:105: ret= navigationOrAttributeCallExp[opName, ret, firstToken] { pushFollow(FOLLOW_navigationOrAttributeCallExp_in_priority_05401); - ret=navigationOrAttributeCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=navigationOrAttributeCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; } break; @@ -12185,8 +10762,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:981:167: ( RARROW (ret= iteratorExp[opName, ret, firstToken] | ret= iterateExp[opName, ret, firstToken] | ret= collectionOperationCallExp[opName, ret, firstToken] ) ) // ATL_ANTLR3.g:981:168: RARROW (ret= iteratorExp[opName, ret, firstToken] | ret= iterateExp[opName, ret, firstToken] | ret= collectionOperationCallExp[opName, ret, firstToken] ) { - match(input,RARROW,FOLLOW_RARROW_in_priority_05409); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,RARROW,FOLLOW_RARROW_in_priority_05409); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "->"; } // ATL_ANTLR3.g:981:192: (ret= iteratorExp[opName, ret, firstToken] | ret= iterateExp[opName, ret, firstToken] | ret= collectionOperationCallExp[opName, ret, firstToken] ) @@ -12197,9 +10774,10 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:981:193: ret= iteratorExp[opName, ret, firstToken] { pushFollow(FOLLOW_iteratorExp_in_priority_05416); - ret=iteratorExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=iteratorExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; } break; @@ -12207,9 +10785,10 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:981:236: ret= iterateExp[opName, ret, firstToken] { pushFollow(FOLLOW_iterateExp_in_priority_05423); - ret=iterateExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=iterateExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; } break; @@ -12217,9 +10796,10 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:981:278: ret= collectionOperationCallExp[opName, ret, firstToken] { pushFollow(FOLLOW_collectionOperationCallExp_in_priority_05430); - ret=collectionOperationCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=collectionOperationCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; } break; @@ -12247,7 +10827,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -12264,10 +10844,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_0 + // $ANTLR end "priority_0" - // $ANTLR start priority_1 + // $ANTLR start "priority_1" // ATL_ANTLR3.g:988:1: priority_1 returns [Object ret2] : ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) ) ; public final Object priority_1() throws RecognitionException { Object ret2 = null; @@ -12325,9 +10905,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("989:4: ( ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) | (ret= priority_0 ) )", 112, 0, input); + new NoViableAltException("", 112, 0, input); throw nvae; } @@ -12339,22 +10919,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:989:5: ( 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) // ATL_ANTLR3.g:989:6: 'not' (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) { - match(input,94,FOLLOW_94_in_priority_15470); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,94,FOLLOW_94_in_priority_15470); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "not"; } // ATL_ANTLR3.g:989:30: (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) // ATL_ANTLR3.g:989:31: ret= operatorCallExp[opName, right, firstToken] right= priority_0 { pushFollow(FOLLOW_operatorCallExp_in_priority_15477); - ret=operatorCallExp(opName, right, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, right, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_0_in_priority_15482); right=priority_0(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "source", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12373,22 +10955,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:990:71: ( MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) ) // ATL_ANTLR3.g:990:72: MINUS (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) { - match(input,MINUS,FOLLOW_MINUS_in_priority_15490); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,MINUS,FOLLOW_MINUS_in_priority_15490); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "-"; } // ATL_ANTLR3.g:990:94: (ret= operatorCallExp[opName, right, firstToken] right= priority_0 ) // ATL_ANTLR3.g:990:95: ret= operatorCallExp[opName, right, firstToken] right= priority_0 { pushFollow(FOLLOW_operatorCallExp_in_priority_15497); - ret=operatorCallExp(opName, right, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, right, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_0_in_priority_15502); right=priority_0(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "source", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12409,8 +10993,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_priority_0_in_priority_15512); ret=priority_0(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } @@ -12420,7 +11005,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -12437,10 +11022,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_1 + // $ANTLR end "priority_1" - // $ANTLR start priority_2 + // $ANTLR start "priority_2" // ATL_ANTLR3.g:998:1: priority_2 returns [Object ret2] : (ret= priority_1 ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* ) ; public final Object priority_2() throws RecognitionException { Object ret2 = null; @@ -12460,8 +11045,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_priority_1_in_priority_25547); ret=priority_1(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; // ATL_ANTLR3.g:999:20: ( ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) ) )* loop114: do { @@ -12501,9 +11087,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("999:21: ( ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) | ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) )", 113, 0, input); + new NoViableAltException("", 113, 0, input); throw nvae; } @@ -12515,22 +11101,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:999:22: ( STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) // ATL_ANTLR3.g:999:23: STAR (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) { - match(input,STAR,FOLLOW_STAR_in_priority_25552); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,STAR,FOLLOW_STAR_in_priority_25552); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "*"; } // ATL_ANTLR3.g:999:44: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) // ATL_ANTLR3.g:999:45: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 { pushFollow(FOLLOW_operatorCallExp_in_priority_25559); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_1_in_priority_25564); right=priority_1(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12549,22 +11137,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1000:71: ( SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) // ATL_ANTLR3.g:1000:72: SLASH (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) { - match(input,SLASH,FOLLOW_SLASH_in_priority_25572); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,SLASH,FOLLOW_SLASH_in_priority_25572); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "/"; } // ATL_ANTLR3.g:1000:94: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) // ATL_ANTLR3.g:1000:95: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 { pushFollow(FOLLOW_operatorCallExp_in_priority_25579); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_1_in_priority_25584); right=priority_1(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12583,22 +11173,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1001:71: ( 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) // ATL_ANTLR3.g:1001:72: 'div' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) { - match(input,95,FOLLOW_95_in_priority_25592); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,95,FOLLOW_95_in_priority_25592); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "div"; } // ATL_ANTLR3.g:1001:96: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) // ATL_ANTLR3.g:1001:97: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 { pushFollow(FOLLOW_operatorCallExp_in_priority_25599); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_1_in_priority_25604); right=priority_1(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12617,22 +11209,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1002:71: ( 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) ) // ATL_ANTLR3.g:1002:72: 'mod' (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) { - match(input,96,FOLLOW_96_in_priority_25612); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,96,FOLLOW_96_in_priority_25612); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "mod"; } // ATL_ANTLR3.g:1002:96: (ret= operatorCallExp[opName, ret, firstToken] right= priority_1 ) // ATL_ANTLR3.g:1002:97: ret= operatorCallExp[opName, ret, firstToken] right= priority_1 { pushFollow(FOLLOW_operatorCallExp_in_priority_25619); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_1_in_priority_25624); right=priority_1(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12660,7 +11254,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -12677,10 +11271,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_2 + // $ANTLR end "priority_2" - // $ANTLR start priority_3 + // $ANTLR start "priority_3" // ATL_ANTLR3.g:1010:1: priority_3 returns [Object ret2] : (ret= priority_2 ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* ) ; public final Object priority_3() throws RecognitionException { Object ret2 = null; @@ -12700,8 +11294,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_priority_2_in_priority_35665); ret=priority_2(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; // ATL_ANTLR3.g:1011:20: ( ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) ) )* loop116: do { @@ -12728,9 +11323,9 @@ public class ATL_ANTLR3Parser extends Parser { alt115=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1011:21: ( ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) | ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) )", 115, 0, input); + new NoViableAltException("", 115, 0, input); throw nvae; } @@ -12741,22 +11336,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1011:22: ( PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) // ATL_ANTLR3.g:1011:23: PLUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) { - match(input,PLUS,FOLLOW_PLUS_in_priority_35670); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,PLUS,FOLLOW_PLUS_in_priority_35670); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "+"; } // ATL_ANTLR3.g:1011:44: (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) // ATL_ANTLR3.g:1011:45: ret= operatorCallExp[opName, ret, firstToken] right= priority_2 { pushFollow(FOLLOW_operatorCallExp_in_priority_35677); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_2_in_priority_35682); right=priority_2(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12775,22 +11372,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1012:71: ( MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) ) // ATL_ANTLR3.g:1012:72: MINUS (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) { - match(input,MINUS,FOLLOW_MINUS_in_priority_35690); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,MINUS,FOLLOW_MINUS_in_priority_35690); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "-"; } // ATL_ANTLR3.g:1012:94: (ret= operatorCallExp[opName, ret, firstToken] right= priority_2 ) // ATL_ANTLR3.g:1012:95: ret= operatorCallExp[opName, ret, firstToken] right= priority_2 { pushFollow(FOLLOW_operatorCallExp_in_priority_35697); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_2_in_priority_35702); right=priority_2(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12818,7 +11417,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -12835,10 +11434,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_3 + // $ANTLR end "priority_3" - // $ANTLR start priority_4 + // $ANTLR start "priority_4" // ATL_ANTLR3.g:1020:1: priority_4 returns [Object ret2] : (ret= priority_3 ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) ) )* ) ; public final Object priority_4() throws RecognitionException { Object ret2 = null; @@ -12858,8 +11457,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_priority_3_in_priority_45743); ret=priority_3(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; // ATL_ANTLR3.g:1021:20: ( ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) ) )* loop118: do { @@ -12909,9 +11509,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1021:21: ( ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) | ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) )", 117, 0, input); + new NoViableAltException("", 117, 0, input); throw nvae; } @@ -12923,22 +11523,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1021:22: ( EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) // ATL_ANTLR3.g:1021:23: EQ (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,EQ,FOLLOW_EQ_in_priority_45748); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,EQ,FOLLOW_EQ_in_priority_45748); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "="; } // ATL_ANTLR3.g:1021:42: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) // ATL_ANTLR3.g:1021:43: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { pushFollow(FOLLOW_operatorCallExp_in_priority_45755); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_3_in_priority_45760); right=priority_3(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12957,22 +11559,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1022:71: ( GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) // ATL_ANTLR3.g:1022:72: GT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,GT,FOLLOW_GT_in_priority_45768); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,GT,FOLLOW_GT_in_priority_45768); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = ">"; } // ATL_ANTLR3.g:1022:91: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) // ATL_ANTLR3.g:1022:92: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { pushFollow(FOLLOW_operatorCallExp_in_priority_45775); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_3_in_priority_45780); right=priority_3(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -12991,22 +11595,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1023:71: ( LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) // ATL_ANTLR3.g:1023:72: LT (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,LT,FOLLOW_LT_in_priority_45788); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,LT,FOLLOW_LT_in_priority_45788); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "<"; } // ATL_ANTLR3.g:1023:91: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) // ATL_ANTLR3.g:1023:92: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { pushFollow(FOLLOW_operatorCallExp_in_priority_45795); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_3_in_priority_45800); right=priority_3(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -13025,22 +11631,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1024:71: ( GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) // ATL_ANTLR3.g:1024:72: GE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,GE,FOLLOW_GE_in_priority_45808); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,GE,FOLLOW_GE_in_priority_45808); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = ">="; } // ATL_ANTLR3.g:1024:92: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) // ATL_ANTLR3.g:1024:93: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { pushFollow(FOLLOW_operatorCallExp_in_priority_45815); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_3_in_priority_45820); right=priority_3(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -13059,22 +11667,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1025:71: ( LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) // ATL_ANTLR3.g:1025:72: LE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,LE,FOLLOW_LE_in_priority_45828); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,LE,FOLLOW_LE_in_priority_45828); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "<="; } // ATL_ANTLR3.g:1025:92: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) // ATL_ANTLR3.g:1025:93: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { pushFollow(FOLLOW_operatorCallExp_in_priority_45835); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_3_in_priority_45840); right=priority_3(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -13093,22 +11703,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1026:71: ( NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) ) // ATL_ANTLR3.g:1026:72: NE (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) { - match(input,NE,FOLLOW_NE_in_priority_45848); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,NE,FOLLOW_NE_in_priority_45848); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "<>"; } // ATL_ANTLR3.g:1026:92: (ret= operatorCallExp[opName, ret, firstToken] right= priority_3 ) // ATL_ANTLR3.g:1026:93: ret= operatorCallExp[opName, ret, firstToken] right= priority_3 { pushFollow(FOLLOW_operatorCallExp_in_priority_45855); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_3_in_priority_45860); right=priority_3(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -13136,7 +11748,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -13153,10 +11765,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_4 + // $ANTLR end "priority_4" - // $ANTLR start priority_5 + // $ANTLR start "priority_5" // ATL_ANTLR3.g:1034:1: priority_5 returns [Object ret2] : (ret= priority_4 ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* ) ; public final Object priority_5() throws RecognitionException { Object ret2 = null; @@ -13176,8 +11788,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_priority_4_in_priority_55901); ret=priority_4(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; // ATL_ANTLR3.g:1035:20: ( ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) ) )* loop120: do { @@ -13217,9 +11830,9 @@ public class ATL_ANTLR3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1035:21: ( ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) | ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) )", 119, 0, input); + new NoViableAltException("", 119, 0, input); throw nvae; } @@ -13231,22 +11844,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1035:22: ( 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) // ATL_ANTLR3.g:1035:23: 'and' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) { - match(input,97,FOLLOW_97_in_priority_55906); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,97,FOLLOW_97_in_priority_55906); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "and"; } // ATL_ANTLR3.g:1035:47: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) // ATL_ANTLR3.g:1035:48: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 { pushFollow(FOLLOW_operatorCallExp_in_priority_55913); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_4_in_priority_55918); right=priority_4(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -13265,22 +11880,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1036:71: ( 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) // ATL_ANTLR3.g:1036:72: 'or' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) { - match(input,98,FOLLOW_98_in_priority_55926); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,98,FOLLOW_98_in_priority_55926); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "or"; } // ATL_ANTLR3.g:1036:94: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) // ATL_ANTLR3.g:1036:95: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 { pushFollow(FOLLOW_operatorCallExp_in_priority_55933); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_4_in_priority_55938); right=priority_4(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -13299,22 +11916,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1037:71: ( 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) // ATL_ANTLR3.g:1037:72: 'xor' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) { - match(input,99,FOLLOW_99_in_priority_55946); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,99,FOLLOW_99_in_priority_55946); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "xor"; } // ATL_ANTLR3.g:1037:96: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) // ATL_ANTLR3.g:1037:97: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 { pushFollow(FOLLOW_operatorCallExp_in_priority_55953); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_4_in_priority_55958); right=priority_4(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -13333,22 +11952,24 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1038:71: ( 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) ) // ATL_ANTLR3.g:1038:72: 'implies' (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) { - match(input,100,FOLLOW_100_in_priority_55966); if (failed) return ret2; - if ( backtracking==0 ) { + match(input,100,FOLLOW_100_in_priority_55966); if (state.failed) return ret2; + if ( state.backtracking==0 ) { opName = "implies"; } // ATL_ANTLR3.g:1038:104: (ret= operatorCallExp[opName, ret, firstToken] right= priority_4 ) // ATL_ANTLR3.g:1038:105: ret= operatorCallExp[opName, ret, firstToken] right= priority_4 { pushFollow(FOLLOW_operatorCallExp_in_priority_55973); - ret=operatorCallExp(opName, ret, firstToken); - _fsp--; - if (failed) return ret2; + ret=operatorCallExp(opName, ret, firstToken); + + state._fsp--; + if (state.failed) return ret2; pushFollow(FOLLOW_priority_4_in_priority_55978); right=priority_4(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "arguments", right);if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); ei.setCommentsAfter(ret, new Object[] {input, input.LT(-1)}); } @@ -13376,7 +11997,7 @@ public class ATL_ANTLR3Parser extends Parser { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -13393,10 +12014,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end priority_5 + // $ANTLR end "priority_5" - // $ANTLR start matchedRule_abstractContents + // $ANTLR start "matchedRule_abstractContents" // ATL_ANTLR3.g:1046:1: matchedRule_abstractContents returns [Object ret2] : ( ( ( 'nodefault' ) | () ) ( ( 'abstract' ) | () ) ( ( 'refining' ) | () ) 'rule' temp= identifier ( ( 'extends' temp= identifier ) | () ) LCURLY ( (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) RCURLY ) ; public final Object matchedRule_abstractContents() throws RecognitionException { Object ret2 = null; @@ -13404,7 +12025,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("MatchedRule", true, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("MatchedRule", true, true) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:1047:2: ( ( ( ( 'nodefault' ) | () ) ( ( 'abstract' ) | () ) ( ( 'refining' ) | () ) 'rule' temp= identifier ( ( 'extends' temp= identifier ) | () ) LCURLY ( (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) RCURLY ) ) // ATL_ANTLR3.g:1047:4: ( ( ( 'nodefault' ) | () ) ( ( 'abstract' ) | () ) ( ( 'refining' ) | () ) 'rule' temp= identifier ( ( 'extends' temp= identifier ) | () ) LCURLY ( (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) RCURLY ) @@ -13423,9 +12044,9 @@ public class ATL_ANTLR3Parser extends Parser { alt121=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1047:5: ( ( 'nodefault' ) | () )", 121, 0, input); + new NoViableAltException("", 121, 0, input); throw nvae; } @@ -13436,11 +12057,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1047:6: ( 'nodefault' ) // ATL_ANTLR3.g:1047:7: 'nodefault' { - match(input,53,FOLLOW_53_in_matchedRule_abstractContents6019); if (failed) return ret2; + match(input,53,FOLLOW_53_in_matchedRule_abstractContents6019); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isNoDefault", java.lang.Boolean.TRUE); } @@ -13454,7 +12075,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isNoDefault", java.lang.Boolean.FALSE); } @@ -13474,9 +12095,9 @@ public class ATL_ANTLR3Parser extends Parser { alt122=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1047:134: ( ( 'abstract' ) | () )", 122, 0, input); + new NoViableAltException("", 122, 0, input); throw nvae; } @@ -13487,11 +12108,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1047:135: ( 'abstract' ) // ATL_ANTLR3.g:1047:136: 'abstract' { - match(input,54,FOLLOW_54_in_matchedRule_abstractContents6033); if (failed) return ret2; + match(input,54,FOLLOW_54_in_matchedRule_abstractContents6033); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isAbstract", java.lang.Boolean.TRUE); } @@ -13505,7 +12126,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isAbstract", java.lang.Boolean.FALSE); } @@ -13525,9 +12146,9 @@ public class ATL_ANTLR3Parser extends Parser { alt123=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1047:260: ( ( 'refining' ) | () )", 123, 0, input); + new NoViableAltException("", 123, 0, input); throw nvae; } @@ -13538,11 +12159,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1047:261: ( 'refining' ) // ATL_ANTLR3.g:1047:262: 'refining' { - match(input,45,FOLLOW_45_in_matchedRule_abstractContents6047); if (failed) return ret2; + match(input,45,FOLLOW_45_in_matchedRule_abstractContents6047); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isRefining", java.lang.Boolean.TRUE); } @@ -13556,7 +12177,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.set(ret, "isRefining", java.lang.Boolean.FALSE); } @@ -13565,12 +12186,13 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,55,FOLLOW_55_in_matchedRule_abstractContents6059); if (failed) return ret2; + match(input,55,FOLLOW_55_in_matchedRule_abstractContents6059); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_matchedRule_abstractContents6063); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "name", temp); } // ATL_ANTLR3.g:1047:438: ( ( 'extends' temp= identifier ) | () ) @@ -13584,9 +12206,9 @@ public class ATL_ANTLR3Parser extends Parser { alt124=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1047:438: ( ( 'extends' temp= identifier ) | () )", 124, 0, input); + new NoViableAltException("", 124, 0, input); throw nvae; } @@ -13597,18 +12219,19 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1047:439: ( 'extends' temp= identifier ) // ATL_ANTLR3.g:1047:440: 'extends' temp= identifier { - match(input,56,FOLLOW_56_in_matchedRule_abstractContents6069); if (failed) return ret2; + match(input,56,FOLLOW_56_in_matchedRule_abstractContents6069); if (state.failed) return ret2; pushFollow(FOLLOW_identifier_in_matchedRule_abstractContents6073); temp=identifier(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.setRef(ret, "superRule", "MatchedRule", "name", temp, null, "never", null, true, null); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -13621,7 +12244,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -13629,7 +12252,7 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,LCURLY,FOLLOW_LCURLY_in_matchedRule_abstractContents6087); if (failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_matchedRule_abstractContents6087); if (state.failed) return ret2; // ATL_ANTLR3.g:1047:578: ( (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) ) // ATL_ANTLR3.g:1047:579: (temp= inPattern ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) ( (temp= outPattern ) | () ) ( (temp= actionBlock ) | () ) ) { @@ -13638,9 +12261,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_inPattern_in_matchedRule_abstractContents6093); temp=inPattern(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "inPattern", temp); } // ATL_ANTLR3.g:1047:629: ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () ) @@ -13654,9 +12278,9 @@ public class ATL_ANTLR3Parser extends Parser { alt127=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1047:629: ( ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) | () )", 127, 0, input); + new NoViableAltException("", 127, 0, input); throw nvae; } @@ -13667,8 +12291,8 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1047:630: ( 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY ) // ATL_ANTLR3.g:1047:631: 'using' LCURLY ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) RCURLY { - match(input,57,FOLLOW_57_in_matchedRule_abstractContents6099); if (failed) return ret2; - match(input,LCURLY,FOLLOW_LCURLY_in_matchedRule_abstractContents6101); if (failed) return ret2; + match(input,57,FOLLOW_57_in_matchedRule_abstractContents6099); if (state.failed) return ret2; + match(input,LCURLY,FOLLOW_LCURLY_in_matchedRule_abstractContents6101); if (state.failed) return ret2; // ATL_ANTLR3.g:1047:646: ( ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) ) // ATL_ANTLR3.g:1047:647: ( ( (temp= ruleVariableDeclaration ( (temp= ruleVariableDeclaration ) )* ) )? ) { @@ -13691,9 +12315,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_ruleVariableDeclaration_in_matchedRule_abstractContents6109); temp=ruleVariableDeclaration(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "variables", temp); } // ATL_ANTLR3.g:1047:713: ( (temp= ruleVariableDeclaration ) )* @@ -13716,9 +12341,10 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_ruleVariableDeclaration_in_matchedRule_abstractContents6117); temp=ruleVariableDeclaration(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "variables", temp); } @@ -13748,11 +12374,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_matchedRule_abstractContents6129); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_matchedRule_abstractContents6129); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -13765,7 +12391,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -13784,9 +12410,9 @@ public class ATL_ANTLR3Parser extends Parser { alt128=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1047:805: ( (temp= outPattern ) | () )", 128, 0, input); + new NoViableAltException("", 128, 0, input); throw nvae; } @@ -13799,15 +12425,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_outPattern_in_matchedRule_abstractContents6145); temp=outPattern(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "outPattern", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -13820,7 +12447,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -13839,9 +12466,9 @@ public class ATL_ANTLR3Parser extends Parser { alt129=2; } else { - if (backtracking>0) {failed=true; return ret2;} + if (state.backtracking>0) {state.failed=true; return ret2;} NoViableAltException nvae = - new NoViableAltException("1047:870: ( (temp= actionBlock ) | () )", 129, 0, input); + new NoViableAltException("", 129, 0, input); throw nvae; } @@ -13854,15 +12481,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_actionBlock_in_matchedRule_abstractContents6163); temp=actionBlock(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "actionBlock", temp); } } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -13875,7 +12503,7 @@ public class ATL_ANTLR3Parser extends Parser { { } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { } } @@ -13889,11 +12517,11 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_matchedRule_abstractContents6179); if (failed) return ret2; + match(input,RCURLY,FOLLOW_RCURLY_in_matchedRule_abstractContents6179); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(true); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -13913,15 +12541,15 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end matchedRule_abstractContents + // $ANTLR end "matchedRule_abstractContents" - // $ANTLR start oclType_abstractContents + // $ANTLR start "oclType_abstractContents" // ATL_ANTLR3.g:1057:1: oclType_abstractContents returns [Object ret2] : ( 'OclType' ) ; public final Object oclType_abstractContents() throws RecognitionException { Object ret2 = null; - Object ret=(backtracking==0) ? ei.create("OclType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("OclType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:1058:2: ( ( 'OclType' ) ) // ATL_ANTLR3.g:1058:4: ( 'OclType' ) @@ -13929,11 +12557,11 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1058:4: ( 'OclType' ) // ATL_ANTLR3.g:1058:5: 'OclType' { - match(input,86,FOLLOW_86_in_oclType_abstractContents6211); if (failed) return ret2; + match(input,86,FOLLOW_86_in_oclType_abstractContents6211); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -13953,10 +12581,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end oclType_abstractContents + // $ANTLR end "oclType_abstractContents" - // $ANTLR start collectionType_abstractContents + // $ANTLR start "collectionType_abstractContents" // ATL_ANTLR3.g:1068:1: collectionType_abstractContents returns [Object ret2] : ( 'Collection' LPAREN temp= oclType RPAREN ) ; public final Object collectionType_abstractContents() throws RecognitionException { Object ret2 = null; @@ -13964,7 +12592,7 @@ public class ATL_ANTLR3Parser extends Parser { Object temp = null; - Object ret=(backtracking==0) ? ei.create("CollectionType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); + Object ret=(state.backtracking==0) ? ei.create("CollectionType", false, false) : null;org.antlr.runtime.Token firstToken=input.LT(1); try { // ATL_ANTLR3.g:1069:2: ( ( 'Collection' LPAREN temp= oclType RPAREN ) ) // ATL_ANTLR3.g:1069:4: ( 'Collection' LPAREN temp= oclType RPAREN ) @@ -13972,20 +12600,21 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1069:4: ( 'Collection' LPAREN temp= oclType RPAREN ) // ATL_ANTLR3.g:1069:5: 'Collection' LPAREN temp= oclType RPAREN { - match(input,93,FOLLOW_93_in_collectionType_abstractContents6243); if (failed) return ret2; - match(input,LPAREN,FOLLOW_LPAREN_in_collectionType_abstractContents6245); if (failed) return ret2; + match(input,93,FOLLOW_93_in_collectionType_abstractContents6243); if (state.failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_collectionType_abstractContents6245); if (state.failed) return ret2; pushFollow(FOLLOW_oclType_in_collectionType_abstractContents6249); temp=oclType(); - _fsp--; - if (failed) return ret2; - if ( backtracking==0 ) { + + state._fsp--; + if (state.failed) return ret2; + if ( state.backtracking==0 ) { ei.set(ret, "elementType", temp); } - match(input,RPAREN,FOLLOW_RPAREN_in_collectionType_abstractContents6253); if (failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_collectionType_abstractContents6253); if (state.failed) return ret2; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ei.leaveContext(false); if(input.LT(-1) != null) ei.setLocation(ret, firstToken.getLine() + ":" + (firstToken.getCharPositionInLine() + 1) + "-" + ((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndLine() + ":" + (((org.eclipse.m2m.atl.dsls.tcs.injector.wrappers.antlr3.ANTLR3LocationToken)input.LT(-1)).getEndColumn() + 1));ei.setCommentsBefore(ret, new Object[] {input, firstToken}); @@ -14005,10 +12634,10 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end collectionType_abstractContents + // $ANTLR end "collectionType_abstractContents" - // $ANTLR start primary_oclExpression + // $ANTLR start "primary_oclExpression" // ATL_ANTLR3.g:1079:1: primary_oclExpression returns [Object ret2] : ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType ) ; public final Object primary_oclExpression() throws RecognitionException { Object ret2 = null; @@ -14022,180 +12651,7 @@ public class ATL_ANTLR3Parser extends Parser { { // ATL_ANTLR3.g:1080:4: ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType ) int alt130=11; - switch ( input.LA(1) ) { - case LPAREN: - { - alt130=1; - } - break; - case NAME: - { - int LA130_2 = input.LA(2); - - if ( (LA130_2==EOF||(LA130_2>=SEMI && LA130_2<=EQ)||LA130_2==RPAREN||(LA130_2>=RCURLY && LA130_2<=LARROW)||LA130_2==PIPE||(LA130_2>=POINT && LA130_2<=NE)||LA130_2==62||LA130_2==70||(LA130_2>=76 && LA130_2<=77)||(LA130_2>=95 && LA130_2<=100)) ) { - alt130=2; - } - else if ( (LA130_2==EXCL) ) { - alt130=11; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("1080:4: ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType )", 130, 2, input); - - throw nvae; - } - } - break; - case 73: - { - alt130=3; - } - break; - case STRING: - case INT: - case FLOAT: - case 74: - case 75: - { - alt130=4; - } - break; - case 69: - { - alt130=5; - } - break; - case 78: - { - alt130=6; - } - break; - case SHARP: - { - alt130=7; - } - break; - case 80: - { - int LA130_8 = input.LA(2); - - if ( (LA130_8==LCURLY) ) { - alt130=8; - } - else if ( (LA130_8==LPAREN) ) { - alt130=11; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("1080:4: ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType )", 130, 8, input); - - throw nvae; - } - } - break; - case 81: - { - int LA130_9 = input.LA(2); - - if ( (LA130_9==LPAREN) ) { - alt130=11; - } - else if ( (LA130_9==LCURLY) ) { - alt130=8; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("1080:4: ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType )", 130, 9, input); - - throw nvae; - } - } - break; - case 82: - { - int LA130_10 = input.LA(2); - - if ( (LA130_10==LCURLY) ) { - alt130=8; - } - else if ( (LA130_10==LPAREN) ) { - alt130=11; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("1080:4: ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType )", 130, 10, input); - - throw nvae; - } - } - break; - case 83: - { - int LA130_11 = input.LA(2); - - if ( (LA130_11==LPAREN) ) { - alt130=11; - } - else if ( (LA130_11==LCURLY) ) { - alt130=8; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("1080:4: ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType )", 130, 11, input); - - throw nvae; - } - } - break; - case 84: - { - int LA130_12 = input.LA(2); - - if ( (LA130_12==LCURLY) ) { - alt130=9; - } - else if ( (LA130_12==LPAREN) ) { - alt130=11; - } - else { - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("1080:4: ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType )", 130, 12, input); - - throw nvae; - } - } - break; - case 85: - { - alt130=10; - } - break; - case 86: - case 87: - case 88: - case 89: - case 90: - case 91: - case 92: - case 93: - { - alt130=11; - } - break; - default: - if (backtracking>0) {failed=true; return ret2;} - NoViableAltException nvae = - new NoViableAltException("1080:4: ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType )", 130, 0, input); - - throw nvae; - } - + alt130 = dfa130.predict(input); switch (alt130) { case 1 : // ATL_ANTLR3.g:1080:5: ( LPAREN ret= oclExpression RPAREN ) @@ -14203,12 +12659,13 @@ public class ATL_ANTLR3Parser extends Parser { // ATL_ANTLR3.g:1080:5: ( LPAREN ret= oclExpression RPAREN ) // ATL_ANTLR3.g:1080:6: LPAREN ret= oclExpression RPAREN { - match(input,LPAREN,FOLLOW_LPAREN_in_primary_oclExpression6286); if (failed) return ret2; + match(input,LPAREN,FOLLOW_LPAREN_in_primary_oclExpression6286); if (state.failed) return ret2; pushFollow(FOLLOW_oclExpression_in_primary_oclExpression6290); ret=oclExpression(); - _fsp--; - if (failed) return ret2; - match(input,RPAREN,FOLLOW_RPAREN_in_primary_oclExpression6292); if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; + match(input,RPAREN,FOLLOW_RPAREN_in_primary_oclExpression6292); if (state.failed) return ret2; } @@ -14220,8 +12677,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_variableExp_in_primary_oclExpression6298); ret=variableExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -14230,8 +12688,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclUndefinedExp_in_primary_oclExpression6303); ret=oclUndefinedExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -14240,8 +12699,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_primitiveExp_in_primary_oclExpression6308); ret=primitiveExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -14250,8 +12710,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_ifExp_in_primary_oclExpression6313); ret=ifExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -14260,8 +12721,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_superExp_in_primary_oclExpression6318); ret=superExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -14270,8 +12732,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_enumLiteralExp_in_primary_oclExpression6323); ret=enumLiteralExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -14280,8 +12743,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_collectionExp_in_primary_oclExpression6328); ret=collectionExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -14290,8 +12754,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_mapExp_in_primary_oclExpression6333); ret=mapExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -14300,8 +12765,9 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_tupleExp_in_primary_oclExpression6338); ret=tupleExp(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; @@ -14310,15 +12776,16 @@ public class ATL_ANTLR3Parser extends Parser { { pushFollow(FOLLOW_oclType_in_primary_oclExpression6343); ret=oclType(); - _fsp--; - if (failed) return ret2; + + state._fsp--; + if (state.failed) return ret2; } break; } - if ( backtracking==0 ) { + if ( state.backtracking==0 ) { ret2=ret; @@ -14335,60 +12802,75 @@ public class ATL_ANTLR3Parser extends Parser { } return ret2; } - // $ANTLR end primary_oclExpression + // $ANTLR end "primary_oclExpression" + + // $ANTLR start synpred125_ATL_ANTLR3 + public final void synpred125_ATL_ANTLR3_fragment() throws RecognitionException { + Object ret = null; + - // $ANTLR start synpred125 - public final void synpred125_fragment() throws RecognitionException { - // ATL_ANTLR3.g:406:6: ( ifStat ) - // ATL_ANTLR3.g:406:6: ifStat + // ATL_ANTLR3.g:406:6: (ret= ifStat ) + // ATL_ANTLR3.g:406:6: ret= ifStat { - pushFollow(FOLLOW_ifStat_in_synpred1252702); - ifStat(); - _fsp--; - if (failed) return ; + pushFollow(FOLLOW_ifStat_in_synpred125_ATL_ANTLR32702); + ret=ifStat(); + + state._fsp--; + if (state.failed) return ; } } - // $ANTLR end synpred125 + // $ANTLR end synpred125_ATL_ANTLR3 + + // $ANTLR start synpred126_ATL_ANTLR3 + public final void synpred126_ATL_ANTLR3_fragment() throws RecognitionException { + Object ret = null; - // $ANTLR start synpred126 - public final void synpred126_fragment() throws RecognitionException { - // ATL_ANTLR3.g:406:18: ( expressionStat ) - // ATL_ANTLR3.g:406:18: expressionStat + + // ATL_ANTLR3.g:406:18: (ret= expressionStat ) + // ATL_ANTLR3.g:406:18: ret= expressionStat { - pushFollow(FOLLOW_expressionStat_in_synpred1262707); - expressionStat(); - _fsp--; - if (failed) return ; + pushFollow(FOLLOW_expressionStat_in_synpred126_ATL_ANTLR32707); + ret=expressionStat(); + + state._fsp--; + if (state.failed) return ; } } - // $ANTLR end synpred126 + // $ANTLR end synpred126_ATL_ANTLR3 + + // $ANTLR start synpred127_ATL_ANTLR3 + public final void synpred127_ATL_ANTLR3_fragment() throws RecognitionException { + Object ret = null; - // $ANTLR start synpred127 - public final void synpred127_fragment() throws RecognitionException { - // ATL_ANTLR3.g:406:38: ( bindingStat ) - // ATL_ANTLR3.g:406:38: bindingStat + + // ATL_ANTLR3.g:406:38: (ret= bindingStat ) + // ATL_ANTLR3.g:406:38: ret= bindingStat { - pushFollow(FOLLOW_bindingStat_in_synpred1272712); - bindingStat(); - _fsp--; - if (failed) return ; + pushFollow(FOLLOW_bindingStat_in_synpred127_ATL_ANTLR32712); + ret=bindingStat(); + + state._fsp--; + if (state.failed) return ; } } - // $ANTLR end synpred127 + // $ANTLR end synpred127_ATL_ANTLR3 + + // $ANTLR start synpred135_ATL_ANTLR3 + public final void synpred135_ATL_ANTLR3_fragment() throws RecognitionException { + Object temp = null; - // $ANTLR start synpred135 - public final void synpred135_fragment() throws RecognitionException { - // ATL_ANTLR3.g:437:285: ( ( 'else' ( ( ( ( statement ) ) ) | ( LCURLY ( ( ( ( statement ( ( statement ) )* ) )? ) ) RCURLY ) ) ) ) - // ATL_ANTLR3.g:437:285: ( 'else' ( ( ( ( statement ) ) ) | ( LCURLY ( ( ( ( statement ( ( statement ) )* ) )? ) ) RCURLY ) ) ) + + // ATL_ANTLR3.g:437:285: ( ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) ) + // ATL_ANTLR3.g:437:285: ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) { - // ATL_ANTLR3.g:437:285: ( 'else' ( ( ( ( statement ) ) ) | ( LCURLY ( ( ( ( statement ( ( statement ) )* ) )? ) ) RCURLY ) ) ) - // ATL_ANTLR3.g:437:286: 'else' ( ( ( ( statement ) ) ) | ( LCURLY ( ( ( ( statement ( ( statement ) )* ) )? ) ) RCURLY ) ) + // ATL_ANTLR3.g:437:285: ( 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) ) + // ATL_ANTLR3.g:437:286: 'else' ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) { - match(input,70,FOLLOW_70_in_synpred1352912); if (failed) return ; - // ATL_ANTLR3.g:437:293: ( ( ( ( statement ) ) ) | ( LCURLY ( ( ( ( statement ( ( statement ) )* ) )? ) ) RCURLY ) ) + match(input,70,FOLLOW_70_in_synpred135_ATL_ANTLR32912); if (state.failed) return ; + // ATL_ANTLR3.g:437:293: ( ( ( (temp= statement ) ) ) | ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) ) int alt163=2; int LA163_0 = input.LA(1); @@ -14399,29 +12881,30 @@ public class ATL_ANTLR3Parser extends Parser { alt163=2; } else { - if (backtracking>0) {failed=true; return ;} + if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("437:293: ( ( ( ( statement ) ) ) | ( LCURLY ( ( ( ( statement ( ( statement ) )* ) )? ) ) RCURLY ) )", 163, 0, input); + new NoViableAltException("", 163, 0, input); throw nvae; } switch (alt163) { case 1 : - // ATL_ANTLR3.g:437:294: ( ( ( statement ) ) ) + // ATL_ANTLR3.g:437:294: ( ( (temp= statement ) ) ) { - // ATL_ANTLR3.g:437:294: ( ( ( statement ) ) ) - // ATL_ANTLR3.g:437:295: ( ( statement ) ) + // ATL_ANTLR3.g:437:294: ( ( (temp= statement ) ) ) + // ATL_ANTLR3.g:437:295: ( (temp= statement ) ) { - // ATL_ANTLR3.g:437:295: ( ( statement ) ) - // ATL_ANTLR3.g:437:296: ( statement ) + // ATL_ANTLR3.g:437:295: ( (temp= statement ) ) + // ATL_ANTLR3.g:437:296: (temp= statement ) { - // ATL_ANTLR3.g:437:296: ( statement ) - // ATL_ANTLR3.g:437:297: statement + // ATL_ANTLR3.g:437:296: (temp= statement ) + // ATL_ANTLR3.g:437:297: temp= statement { - pushFollow(FOLLOW_statement_in_synpred1352920); - statement(); - _fsp--; - if (failed) return ; + pushFollow(FOLLOW_statement_in_synpred135_ATL_ANTLR32920); + temp=statement(); + + state._fsp--; + if (state.failed) return ; } @@ -14435,19 +12918,19 @@ public class ATL_ANTLR3Parser extends Parser { } break; case 2 : - // ATL_ANTLR3.g:437:358: ( LCURLY ( ( ( ( statement ( ( statement ) )* ) )? ) ) RCURLY ) + // ATL_ANTLR3.g:437:358: ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) { - // ATL_ANTLR3.g:437:358: ( LCURLY ( ( ( ( statement ( ( statement ) )* ) )? ) ) RCURLY ) - // ATL_ANTLR3.g:437:359: LCURLY ( ( ( ( statement ( ( statement ) )* ) )? ) ) RCURLY + // ATL_ANTLR3.g:437:358: ( LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY ) + // ATL_ANTLR3.g:437:359: LCURLY ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) RCURLY { - match(input,LCURLY,FOLLOW_LCURLY_in_synpred1352931); if (failed) return ; - // ATL_ANTLR3.g:437:366: ( ( ( ( statement ( ( statement ) )* ) )? ) ) - // ATL_ANTLR3.g:437:367: ( ( ( statement ( ( statement ) )* ) )? ) + match(input,LCURLY,FOLLOW_LCURLY_in_synpred135_ATL_ANTLR32931); if (state.failed) return ; + // ATL_ANTLR3.g:437:366: ( ( ( (temp= statement ( (temp= statement ) )* ) )? ) ) + // ATL_ANTLR3.g:437:367: ( ( (temp= statement ( (temp= statement ) )* ) )? ) { - // ATL_ANTLR3.g:437:367: ( ( ( statement ( ( statement ) )* ) )? ) - // ATL_ANTLR3.g:437:368: ( ( statement ( ( statement ) )* ) )? + // ATL_ANTLR3.g:437:367: ( ( (temp= statement ( (temp= statement ) )* ) )? ) + // ATL_ANTLR3.g:437:368: ( (temp= statement ( (temp= statement ) )* ) )? { - // ATL_ANTLR3.g:437:368: ( ( statement ( ( statement ) )* ) )? + // ATL_ANTLR3.g:437:368: ( (temp= statement ( (temp= statement ) )* ) )? int alt162=2; int LA162_0 = input.LA(1); @@ -14456,16 +12939,17 @@ public class ATL_ANTLR3Parser extends Parser { } switch (alt162) { case 1 : - // ATL_ANTLR3.g:437:369: ( statement ( ( statement ) )* ) + // ATL_ANTLR3.g:437:369: (temp= statement ( (temp= statement ) )* ) { - // ATL_ANTLR3.g:437:369: ( statement ( ( statement ) )* ) - // ATL_ANTLR3.g:437:370: statement ( ( statement ) )* + // ATL_ANTLR3.g:437:369: (temp= statement ( (temp= statement ) )* ) + // ATL_ANTLR3.g:437:370: temp= statement ( (temp= statement ) )* { - pushFollow(FOLLOW_statement_in_synpred1352939); - statement(); - _fsp--; - if (failed) return ; - // ATL_ANTLR3.g:437:424: ( ( statement ) )* + pushFollow(FOLLOW_statement_in_synpred135_ATL_ANTLR32939); + temp=statement(); + + state._fsp--; + if (state.failed) return ; + // ATL_ANTLR3.g:437:424: ( (temp= statement ) )* loop161: do { int alt161=2; @@ -14478,15 +12962,16 @@ public class ATL_ANTLR3Parser extends Parser { switch (alt161) { case 1 : - // ATL_ANTLR3.g:437:425: ( statement ) + // ATL_ANTLR3.g:437:425: (temp= statement ) { - // ATL_ANTLR3.g:437:425: ( statement ) - // ATL_ANTLR3.g:437:426: statement + // ATL_ANTLR3.g:437:425: (temp= statement ) + // ATL_ANTLR3.g:437:426: temp= statement { - pushFollow(FOLLOW_statement_in_synpred1352947); - statement(); - _fsp--; - if (failed) return ; + pushFollow(FOLLOW_statement_in_synpred135_ATL_ANTLR32947); + temp=statement(); + + state._fsp--; + if (state.failed) return ; } @@ -14514,7 +12999,7 @@ public class ATL_ANTLR3Parser extends Parser { } - match(input,RCURLY,FOLLOW_RCURLY_in_synpred1352959); if (failed) return ; + match(input,RCURLY,FOLLOW_RCURLY_in_synpred135_ATL_ANTLR32959); if (state.failed) return ; } @@ -14530,67 +13015,764 @@ public class ATL_ANTLR3Parser extends Parser { } } - // $ANTLR end synpred135 + // $ANTLR end synpred135_ATL_ANTLR3 - public final boolean synpred135() { - backtracking++; + // Delegated rules + + public final boolean synpred125_ATL_ANTLR3() { + state.backtracking++; int start = input.mark(); try { - synpred135_fragment(); // can never throw exception + synpred125_ATL_ANTLR3_fragment(); // can never throw exception } catch (RecognitionException re) { System.err.println("impossible: "+re); } - boolean success = !failed; + boolean success = !state.failed; input.rewind(start); - backtracking--; - failed=false; + state.backtracking--; + state.failed=false; return success; } - public final boolean synpred126() { - backtracking++; + public final boolean synpred127_ATL_ANTLR3() { + state.backtracking++; int start = input.mark(); try { - synpred126_fragment(); // can never throw exception + synpred127_ATL_ANTLR3_fragment(); // can never throw exception } catch (RecognitionException re) { System.err.println("impossible: "+re); } - boolean success = !failed; + boolean success = !state.failed; input.rewind(start); - backtracking--; - failed=false; + state.backtracking--; + state.failed=false; return success; } - public final boolean synpred127() { - backtracking++; + public final boolean synpred126_ATL_ANTLR3() { + state.backtracking++; int start = input.mark(); try { - synpred127_fragment(); // can never throw exception + synpred126_ATL_ANTLR3_fragment(); // can never throw exception } catch (RecognitionException re) { System.err.println("impossible: "+re); } - boolean success = !failed; + boolean success = !state.failed; input.rewind(start); - backtracking--; - failed=false; + state.backtracking--; + state.failed=false; return success; } - public final boolean synpred125() { - backtracking++; + public final boolean synpred135_ATL_ANTLR3() { + state.backtracking++; int start = input.mark(); try { - synpred125_fragment(); // can never throw exception + synpred135_ATL_ANTLR3_fragment(); // can never throw exception } catch (RecognitionException re) { System.err.println("impossible: "+re); } - boolean success = !failed; + boolean success = !state.failed; input.rewind(start); - backtracking--; - failed=false; + state.backtracking--; + state.failed=false; return success; } + protected DFA67 dfa67 = new DFA67(this); + protected DFA108 dfa108 = new DFA108(this); protected DFA109 dfa109 = new DFA109(this); + protected DFA130 dfa130 = new DFA130(this); + static final String DFA67_eotS = + "\41\uffff"; + static final String DFA67_eofS = + "\41\uffff"; + static final String DFA67_minS = + "\1\4\34\0\4\uffff"; + static final String DFA67_maxS = + "\1\136\34\0\4\uffff"; + static final String DFA67_acceptS = + "\35\uffff\1\4\1\1\1\2\1\3"; + static final String DFA67_specialS = + "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14"+ + "\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31"+ + "\1\32\1\33\4\uffff}>"; + static final String[] DFA67_transitionS = { + "\1\5\1\13\1\7\1\10\4\uffff\1\4\10\uffff\1\15\1\uffff\1\3\55"+ + "\uffff\1\1\1\uffff\1\35\1\uffff\1\6\1\11\1\12\2\uffff\1\14\1"+ + "\34\1\16\1\17\1\20\1\21\1\22\1\23\1\33\1\24\1\25\1\26\1\27\1"+ + "\30\1\31\1\32\1\2", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "\1\uffff", + "", + "", + "", + "" + }; + + static final short[] DFA67_eot = DFA.unpackEncodedString(DFA67_eotS); + static final short[] DFA67_eof = DFA.unpackEncodedString(DFA67_eofS); + static final char[] DFA67_min = DFA.unpackEncodedStringToUnsignedChars(DFA67_minS); + static final char[] DFA67_max = DFA.unpackEncodedStringToUnsignedChars(DFA67_maxS); + static final short[] DFA67_accept = DFA.unpackEncodedString(DFA67_acceptS); + static final short[] DFA67_special = DFA.unpackEncodedString(DFA67_specialS); + static final short[][] DFA67_transition; + + static { + int numStates = DFA67_transitionS.length; + DFA67_transition = new short[numStates][]; + for (int i=0; i<numStates; i++) { + DFA67_transition[i] = DFA.unpackEncodedString(DFA67_transitionS[i]); + } + } + + class DFA67 extends DFA { + + public DFA67(BaseRecognizer recognizer) { + this.recognizer = recognizer; + this.decisionNumber = 67; + this.eot = DFA67_eot; + this.eof = DFA67_eof; + this.min = DFA67_min; + this.max = DFA67_max; + this.accept = DFA67_accept; + this.special = DFA67_special; + this.transition = DFA67_transition; + } + public String getDescription() { + return "406:5: (ret= ifStat | ret= expressionStat | ret= bindingStat | ret= forStat )"; + } + public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { + TokenStream input = (TokenStream)_input; + int _s = s; + switch ( s ) { + case 0 : + int LA67_1 = input.LA(1); + + + int index67_1 = input.index(); + input.rewind(); + s = -1; + if ( (synpred125_ATL_ANTLR3()) ) {s = 30;} + + else if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_1); + if ( s>=0 ) return s; + break; + case 1 : + int LA67_2 = input.LA(1); + + + int index67_2 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_2); + if ( s>=0 ) return s; + break; + case 2 : + int LA67_3 = input.LA(1); + + + int index67_3 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_3); + if ( s>=0 ) return s; + break; + case 3 : + int LA67_4 = input.LA(1); + + + int index67_4 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_4); + if ( s>=0 ) return s; + break; + case 4 : + int LA67_5 = input.LA(1); + + + int index67_5 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_5); + if ( s>=0 ) return s; + break; + case 5 : + int LA67_6 = input.LA(1); + + + int index67_6 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_6); + if ( s>=0 ) return s; + break; + case 6 : + int LA67_7 = input.LA(1); + + + int index67_7 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_7); + if ( s>=0 ) return s; + break; + case 7 : + int LA67_8 = input.LA(1); + + + int index67_8 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_8); + if ( s>=0 ) return s; + break; + case 8 : + int LA67_9 = input.LA(1); + + + int index67_9 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_9); + if ( s>=0 ) return s; + break; + case 9 : + int LA67_10 = input.LA(1); + + + int index67_10 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_10); + if ( s>=0 ) return s; + break; + case 10 : + int LA67_11 = input.LA(1); + + + int index67_11 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_11); + if ( s>=0 ) return s; + break; + case 11 : + int LA67_12 = input.LA(1); + + + int index67_12 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_12); + if ( s>=0 ) return s; + break; + case 12 : + int LA67_13 = input.LA(1); + + + int index67_13 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_13); + if ( s>=0 ) return s; + break; + case 13 : + int LA67_14 = input.LA(1); + + + int index67_14 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_14); + if ( s>=0 ) return s; + break; + case 14 : + int LA67_15 = input.LA(1); + + + int index67_15 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_15); + if ( s>=0 ) return s; + break; + case 15 : + int LA67_16 = input.LA(1); + + + int index67_16 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_16); + if ( s>=0 ) return s; + break; + case 16 : + int LA67_17 = input.LA(1); + + + int index67_17 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_17); + if ( s>=0 ) return s; + break; + case 17 : + int LA67_18 = input.LA(1); + + + int index67_18 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_18); + if ( s>=0 ) return s; + break; + case 18 : + int LA67_19 = input.LA(1); + + + int index67_19 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_19); + if ( s>=0 ) return s; + break; + case 19 : + int LA67_20 = input.LA(1); + + + int index67_20 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_20); + if ( s>=0 ) return s; + break; + case 20 : + int LA67_21 = input.LA(1); + + + int index67_21 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_21); + if ( s>=0 ) return s; + break; + case 21 : + int LA67_22 = input.LA(1); + + + int index67_22 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_22); + if ( s>=0 ) return s; + break; + case 22 : + int LA67_23 = input.LA(1); + + + int index67_23 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_23); + if ( s>=0 ) return s; + break; + case 23 : + int LA67_24 = input.LA(1); + + + int index67_24 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_24); + if ( s>=0 ) return s; + break; + case 24 : + int LA67_25 = input.LA(1); + + + int index67_25 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_25); + if ( s>=0 ) return s; + break; + case 25 : + int LA67_26 = input.LA(1); + + + int index67_26 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_26); + if ( s>=0 ) return s; + break; + case 26 : + int LA67_27 = input.LA(1); + + + int index67_27 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_27); + if ( s>=0 ) return s; + break; + case 27 : + int LA67_28 = input.LA(1); + + + int index67_28 = input.index(); + input.rewind(); + s = -1; + if ( (synpred126_ATL_ANTLR3()) ) {s = 31;} + + else if ( (synpred127_ATL_ANTLR3()) ) {s = 32;} + + + input.seek(index67_28); + if ( s>=0 ) return s; + break; + } + if (state.backtracking>0) {state.failed=true; return -1;} + NoViableAltException nvae = + new NoViableAltException(getDescription(), 67, _s, input); + error(nvae); + throw nvae; + } + } + static final String DFA108_eotS = + "\76\uffff"; + static final String DFA108_eofS = + "\1\uffff\73\74\2\uffff"; + static final String DFA108_minS = + "\1\4\73\10\2\uffff"; + static final String DFA108_maxS = + "\74\144\2\uffff"; + static final String DFA108_acceptS = + "\74\uffff\1\2\1\1"; + static final String DFA108_specialS = + "\76\uffff}>"; + static final String[] DFA108_transitionS = { + "\1\1\46\uffff\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+ + "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1"+ + "\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1"+ + "\44\1\45\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1"+ + "\60\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\70\1\71\1\72\1\73", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "\3\74\1\uffff\1\75\1\74\1\uffff\4\74\1\uffff\1\74\1\uffff\12"+ + "\74\36\uffff\1\74\7\uffff\1\74\5\uffff\2\74\21\uffff\6\74", + "", + "" + }; + + static final short[] DFA108_eot = DFA.unpackEncodedString(DFA108_eotS); + static final short[] DFA108_eof = DFA.unpackEncodedString(DFA108_eofS); + static final char[] DFA108_min = DFA.unpackEncodedStringToUnsignedChars(DFA108_minS); + static final char[] DFA108_max = DFA.unpackEncodedStringToUnsignedChars(DFA108_maxS); + static final short[] DFA108_accept = DFA.unpackEncodedString(DFA108_acceptS); + static final short[] DFA108_special = DFA.unpackEncodedString(DFA108_specialS); + static final short[][] DFA108_transition; + + static { + int numStates = DFA108_transitionS.length; + DFA108_transition = new short[numStates][]; + for (int i=0; i<numStates; i++) { + DFA108_transition[i] = DFA.unpackEncodedString(DFA108_transitionS[i]); + } + } + + class DFA108 extends DFA { + + public DFA108(BaseRecognizer recognizer) { + this.recognizer = recognizer; + this.decisionNumber = 108; + this.eot = DFA108_eot; + this.eof = DFA108_eof; + this.min = DFA108_min; + this.max = DFA108_max; + this.accept = DFA108_accept; + this.special = DFA108_special; + this.transition = DFA108_transition; + } + public String getDescription() { + return "981:56: (ret= operationCallExp[opName, ret, firstToken] | ret= navigationOrAttributeCallExp[opName, ret, firstToken] )"; + } + } static final String DFA109_eotS = "\11\uffff"; static final String DFA109_eofS = @@ -14652,6 +13834,75 @@ public class ATL_ANTLR3Parser extends Parser { return "981:192: (ret= iteratorExp[opName, ret, firstToken] | ret= iterateExp[opName, ret, firstToken] | ret= collectionOperationCallExp[opName, ret, firstToken] )"; } } + static final String DFA130_eotS = + "\22\uffff"; + static final String DFA130_eofS = + "\2\uffff\1\17\17\uffff"; + static final String DFA130_minS = + "\1\4\1\uffff\1\10\5\uffff\5\14\5\uffff"; + static final String DFA130_maxS = + "\1\135\1\uffff\1\144\5\uffff\5\16\5\uffff"; + static final String DFA130_acceptS = + "\1\uffff\1\1\1\uffff\1\3\1\4\1\5\1\6\1\7\5\uffff\1\12\1\13\1\2\1"+ + "\10\1\11"; + static final String DFA130_specialS = + "\22\uffff}>"; + static final String[] DFA130_transitionS = { + "\1\2\3\4\4\uffff\1\1\10\uffff\1\7\57\uffff\1\5\3\uffff\1\3\2"+ + "\4\2\uffff\1\6\1\uffff\1\10\1\11\1\12\1\13\1\14\1\15\10\16", + "", + "\3\17\2\uffff\1\17\1\uffff\4\17\1\16\1\17\1\uffff\12\17\36"+ + "\uffff\1\17\7\uffff\1\17\5\uffff\2\17\21\uffff\6\17", + "", + "", + "", + "", + "", + "\1\16\1\uffff\1\20", + "\1\16\1\uffff\1\20", + "\1\16\1\uffff\1\20", + "\1\16\1\uffff\1\20", + "\1\16\1\uffff\1\21", + "", + "", + "", + "", + "" + }; + + static final short[] DFA130_eot = DFA.unpackEncodedString(DFA130_eotS); + static final short[] DFA130_eof = DFA.unpackEncodedString(DFA130_eofS); + static final char[] DFA130_min = DFA.unpackEncodedStringToUnsignedChars(DFA130_minS); + static final char[] DFA130_max = DFA.unpackEncodedStringToUnsignedChars(DFA130_maxS); + static final short[] DFA130_accept = DFA.unpackEncodedString(DFA130_acceptS); + static final short[] DFA130_special = DFA.unpackEncodedString(DFA130_specialS); + static final short[][] DFA130_transition; + + static { + int numStates = DFA130_transitionS.length; + DFA130_transition = new short[numStates][]; + for (int i=0; i<numStates; i++) { + DFA130_transition[i] = DFA.unpackEncodedString(DFA130_transitionS[i]); + } + } + + class DFA130 extends DFA { + + public DFA130(BaseRecognizer recognizer) { + this.recognizer = recognizer; + this.decisionNumber = 130; + this.eot = DFA130_eot; + this.eof = DFA130_eof; + this.min = DFA130_min; + this.max = DFA130_max; + this.accept = DFA130_accept; + this.special = DFA130_special; + this.transition = DFA130_transition; + } + public String getDescription() { + return "1080:4: ( ( LPAREN ret= oclExpression RPAREN ) | ret= variableExp | ret= oclUndefinedExp | ret= primitiveExp | ret= ifExp | ret= superExp | ret= enumLiteralExp | ret= collectionExp | ret= mapExp | ret= tupleExp | ret= oclType )"; + } + } public static final BitSet FOLLOW_unit_in_main61 = new BitSet(new long[]{0x0000000000000000L}); @@ -14767,7 +14018,7 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_51_in_oclFeatureDefinition1084 = new BitSet(new long[]{0x0000000000000800L}); public static final BitSet FOLLOW_COLON_in_oclFeatureDefinition1086 = new BitSet(new long[]{0x0000000000000010L}); public static final BitSet FOLLOW_oclFeature_in_oclFeatureDefinition1090 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_52_in_oclContextDefinition1124 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_52_in_oclContextDefinition1124 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_oclContextDefinition1128 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_operation_in_oclFeature1165 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_attribute_in_oclFeature1170 = new BitSet(new long[]{0x0000000000000002L}); @@ -14777,15 +14028,15 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_COMA_in_operation1222 = new BitSet(new long[]{0x0000000000000010L}); public static final BitSet FOLLOW_parameter_in_operation1227 = new BitSet(new long[]{0x0000000000002200L}); public static final BitSet FOLLOW_RPAREN_in_operation1237 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_COLON_in_operation1239 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COLON_in_operation1239 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_operation1243 = new BitSet(new long[]{0x0000000000000400L}); public static final BitSet FOLLOW_EQ_in_operation1247 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFFCE20L}); public static final BitSet FOLLOW_oclExpression_in_operation1253 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_identifier_in_parameter1291 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_COLON_in_parameter1295 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COLON_in_parameter1295 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_parameter1299 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_identifier_in_attribute1335 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_COLON_in_attribute1339 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COLON_in_attribute1339 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_attribute1343 = new BitSet(new long[]{0x0000000000000400L}); public static final BitSet FOLLOW_EQ_in_attribute1347 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFFCE20L}); public static final BitSet FOLLOW_oclExpression_in_attribute1353 = new BitSet(new long[]{0x0000000000000002L}); @@ -14812,7 +14063,7 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_actionBlock_in_lazyMatchedRule1619 = new BitSet(new long[]{0x0000000000008000L}); public static final BitSet FOLLOW_RCURLY_in_lazyMatchedRule1635 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_identifier_in_ruleVariableDeclaration1669 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_COLON_in_ruleVariableDeclaration1673 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COLON_in_ruleVariableDeclaration1673 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_ruleVariableDeclaration1677 = new BitSet(new long[]{0x0000000000000400L}); public static final BitSet FOLLOW_EQ_in_ruleVariableDeclaration1681 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFFCE20L}); public static final BitSet FOLLOW_oclExpression_in_ruleVariableDeclaration1685 = new BitSet(new long[]{0x0000000000000100L}); @@ -14844,7 +14095,7 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_RPAREN_in_inPattern1948 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_simpleInPatternElement_in_inPatternElement1994 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_identifier_in_simpleInPatternElement2028 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_COLON_in_simpleInPatternElement2032 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COLON_in_simpleInPatternElement2032 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_simpleInPatternElement2036 = new BitSet(new long[]{0x4000000000000002L}); public static final BitSet FOLLOW_62_in_simpleInPatternElement2042 = new BitSet(new long[]{0x0000000000000012L}); public static final BitSet FOLLOW_identifier_in_simpleInPatternElement2048 = new BitSet(new long[]{0x0000000000000202L}); @@ -14858,7 +14109,7 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_simpleOutPatternElement_in_outPatternElement2204 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_forEachOutPatternElement_in_outPatternElement2209 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_identifier_in_simpleOutPatternElement2244 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_COLON_in_simpleOutPatternElement2248 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COLON_in_simpleOutPatternElement2248 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_simpleOutPatternElement2252 = new BitSet(new long[]{0x4000000000011002L,0x0000000000000001L}); public static final BitSet FOLLOW_62_in_simpleOutPatternElement2258 = new BitSet(new long[]{0x0000000000000010L}); public static final BitSet FOLLOW_identifier_in_simpleOutPatternElement2262 = new BitSet(new long[]{0x0000000000011002L,0x0000000000000001L}); @@ -14877,7 +14128,7 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_RPAREN_in_simpleOutPatternElement2374 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_identifier_in_forEachOutPatternElement2418 = new BitSet(new long[]{0x0000000000000800L}); public static final BitSet FOLLOW_COLON_in_forEachOutPatternElement2422 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L}); - public static final BitSet FOLLOW_65_in_forEachOutPatternElement2424 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_65_in_forEachOutPatternElement2424 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_forEachOutPatternElement2428 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L}); public static final BitSet FOLLOW_66_in_forEachOutPatternElement2432 = new BitSet(new long[]{0x0000000000001000L}); public static final BitSet FOLLOW_LPAREN_in_forEachOutPatternElement2434 = new BitSet(new long[]{0x0000000000000010L}); @@ -15003,7 +14254,7 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_62_in_letExp4020 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFFCE20L}); public static final BitSet FOLLOW_oclExpression_in_letExp4026 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_identifier_in_variableDeclaration4064 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_COLON_in_variableDeclaration4068 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COLON_in_variableDeclaration4068 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_variableDeclaration4072 = new BitSet(new long[]{0x0000000000000400L}); public static final BitSet FOLLOW_EQ_in_variableDeclaration4076 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFFCE20L}); public static final BitSet FOLLOW_oclExpression_in_variableDeclaration4080 = new BitSet(new long[]{0x0000000000000002L}); @@ -15055,7 +14306,7 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_tuplePart_in_tupleExp4581 = new BitSet(new long[]{0x0000000000008200L}); public static final BitSet FOLLOW_RCURLY_in_tupleExp4591 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_identifierOrKeyword_in_tuplePart4625 = new BitSet(new long[]{0x0000000000000C00L}); - public static final BitSet FOLLOW_COLON_in_tuplePart4631 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COLON_in_tuplePart4631 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_tuplePart4635 = new BitSet(new long[]{0x0000000000000400L}); public static final BitSet FOLLOW_EQ_in_tuplePart4649 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFFCE20L}); public static final BitSet FOLLOW_oclExpression_in_tuplePart4653 = new BitSet(new long[]{0x0000000000000002L}); @@ -15074,12 +14325,12 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_tupleTypeAttribute_in_tupleType4805 = new BitSet(new long[]{0x0000000000002200L}); public static final BitSet FOLLOW_RPAREN_in_tupleType4815 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_identifier_in_tupleTypeAttribute4849 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_COLON_in_tupleTypeAttribute4853 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COLON_in_tupleTypeAttribute4853 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_tupleTypeAttribute4857 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_84_in_mapType4891 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_LPAREN_in_mapType4893 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_LPAREN_in_mapType4893 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_mapType4897 = new BitSet(new long[]{0x0000000000000200L}); - public static final BitSet FOLLOW_COMA_in_mapType4901 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_COMA_in_mapType4901 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_mapType4905 = new BitSet(new long[]{0x0000000000002000L}); public static final BitSet FOLLOW_RPAREN_in_mapType4909 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_numericType_in_primitive4944 = new BitSet(new long[]{0x0000000000000002L}); @@ -15097,19 +14348,19 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_sequenceType_in_collectionType5174 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_collectionType_abstractContents_in_collectionType5179 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_80_in_bagType5212 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_LPAREN_in_bagType5214 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_LPAREN_in_bagType5214 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_bagType5218 = new BitSet(new long[]{0x0000000000002000L}); public static final BitSet FOLLOW_RPAREN_in_bagType5222 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_81_in_setType5254 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_LPAREN_in_setType5256 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_LPAREN_in_setType5256 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_setType5260 = new BitSet(new long[]{0x0000000000002000L}); public static final BitSet FOLLOW_RPAREN_in_setType5264 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_82_in_orderedSetType5296 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_LPAREN_in_orderedSetType5298 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_LPAREN_in_orderedSetType5298 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_orderedSetType5302 = new BitSet(new long[]{0x0000000000002000L}); public static final BitSet FOLLOW_RPAREN_in_orderedSetType5306 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_83_in_sequenceType5338 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_LPAREN_in_sequenceType5340 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_LPAREN_in_sequenceType5340 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_sequenceType5344 = new BitSet(new long[]{0x0000000000002000L}); public static final BitSet FOLLOW_RPAREN_in_sequenceType5348 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_primary_oclExpression_in_priority_05382 = new BitSet(new long[]{0x0000000000410002L}); @@ -15120,11 +14371,11 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_iteratorExp_in_priority_05416 = new BitSet(new long[]{0x0000000000410002L}); public static final BitSet FOLLOW_iterateExp_in_priority_05423 = new BitSet(new long[]{0x0000000000410002L}); public static final BitSet FOLLOW_collectionOperationCallExp_in_priority_05430 = new BitSet(new long[]{0x0000000000410002L}); - public static final BitSet FOLLOW_94_in_priority_15470 = new BitSet(new long[]{0x00000000002010F0L,0x000000003FFF4E20L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_15477 = new BitSet(new long[]{0x00000000002010F0L,0x000000003FFF4E20L}); + public static final BitSet FOLLOW_94_in_priority_15470 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_15477 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_priority_0_in_priority_15482 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_MINUS_in_priority_15490 = new BitSet(new long[]{0x00000000002010F0L,0x000000003FFF4E20L}); - public static final BitSet FOLLOW_operatorCallExp_in_priority_15497 = new BitSet(new long[]{0x00000000002010F0L,0x000000003FFF4E20L}); + public static final BitSet FOLLOW_MINUS_in_priority_15490 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); + public static final BitSet FOLLOW_operatorCallExp_in_priority_15497 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_priority_0_in_priority_15502 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_priority_0_in_priority_15512 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_priority_1_in_priority_25547 = new BitSet(new long[]{0x0000000003000002L,0x0000000180000000L}); @@ -15198,7 +14449,7 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_RCURLY_in_matchedRule_abstractContents6179 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_86_in_oclType_abstractContents6211 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_93_in_collectionType_abstractContents6243 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_LPAREN_in_collectionType_abstractContents6245 = new BitSet(new long[]{0x0000000000000010L,0x000000003FDF0000L}); + public static final BitSet FOLLOW_LPAREN_in_collectionType_abstractContents6245 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFF4E20L}); public static final BitSet FOLLOW_oclType_in_collectionType_abstractContents6249 = new BitSet(new long[]{0x0000000000002000L}); public static final BitSet FOLLOW_RPAREN_in_collectionType_abstractContents6253 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_LPAREN_in_primary_oclExpression6286 = new BitSet(new long[]{0x0000000000A010F0L,0x000000007FFFCE20L}); @@ -15214,14 +14465,14 @@ public class ATL_ANTLR3Parser extends Parser { public static final BitSet FOLLOW_mapExp_in_primary_oclExpression6333 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_tupleExp_in_primary_oclExpression6338 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_oclType_in_primary_oclExpression6343 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ifStat_in_synpred1252702 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_expressionStat_in_synpred1262707 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_bindingStat_in_synpred1272712 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_70_in_synpred1352912 = new BitSet(new long[]{0x0000000000A050F0L,0x000000007FFFCEA0L}); - public static final BitSet FOLLOW_statement_in_synpred1352920 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LCURLY_in_synpred1352931 = new BitSet(new long[]{0x0000000000A090F0L,0x000000007FFFCEA0L}); - public static final BitSet FOLLOW_statement_in_synpred1352939 = new BitSet(new long[]{0x0000000000A090F0L,0x000000007FFFCEA0L}); - public static final BitSet FOLLOW_statement_in_synpred1352947 = new BitSet(new long[]{0x0000000000A090F0L,0x000000007FFFCEA0L}); - public static final BitSet FOLLOW_RCURLY_in_synpred1352959 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ifStat_in_synpred125_ATL_ANTLR32702 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_expressionStat_in_synpred126_ATL_ANTLR32707 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_bindingStat_in_synpred127_ATL_ANTLR32712 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_70_in_synpred135_ATL_ANTLR32912 = new BitSet(new long[]{0x0000000000A050F0L,0x000000007FFFCEA0L}); + public static final BitSet FOLLOW_statement_in_synpred135_ATL_ANTLR32920 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LCURLY_in_synpred135_ATL_ANTLR32931 = new BitSet(new long[]{0x0000000000A090F0L,0x000000007FFFCEA0L}); + public static final BitSet FOLLOW_statement_in_synpred135_ATL_ANTLR32939 = new BitSet(new long[]{0x0000000000A090F0L,0x000000007FFFCEA0L}); + public static final BitSet FOLLOW_statement_in_synpred135_ATL_ANTLR32947 = new BitSet(new long[]{0x0000000000A090F0L,0x000000007FFFCEA0L}); + public static final BitSet FOLLOW_RCURLY_in_synpred135_ATL_ANTLR32959 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3__.g b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3__.g deleted file mode 100644 index 0a003784..00000000 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ATL_ANTLR3__.g +++ /dev/null @@ -1,475 +0,0 @@ -lexer grammar ATL_ANTLR3; -@members { - - private void newline() {} - - public org.eclipse.gmt.tcs.injector.TCSRuntime ei = null; - - public void displayRecognitionError(String[] tokenNames, RecognitionException e) { - ei.reportError((Exception)e); - } - - public Token emit() { - org.eclipse.gmt.tcs.injector.wrappers.antlr3.ANTLR3LocationToken ret = null; - - ret = new org.eclipse.gmt.tcs.injector.wrappers.antlr3.ANTLR3LocationToken(input, type, channel, tokenStartCharIndex, getCharIndex()-1); - ret.setLine(tokenStartLine); - ret.setText(text); - ret.setCharPositionInLine(tokenStartCharPositionInLine); - ret.setEndLine(getLine()); - ret.setEndColumn(getCharPositionInLine()); - emit(ret); - - return ret; - } - -} -@header {package org.eclipse.gmt.tcs.injector;} - -T43 : 'module' ; -T44 : 'create' ; -T45 : 'refining' ; -T46 : 'from' ; -T47 : 'library' ; -T48 : 'query' ; -T49 : 'uses' ; -T50 : 'helper' ; -T51 : 'def' ; -T52 : 'context' ; -T53 : 'nodefault' ; -T54 : 'abstract' ; -T55 : 'rule' ; -T56 : 'extends' ; -T57 : 'using' ; -T58 : 'unique' ; -T59 : 'lazy' ; -T60 : 'entrypoint' ; -T61 : 'endpoint' ; -T62 : 'in' ; -T63 : 'to' ; -T64 : 'mapsTo' ; -T65 : 'distinct' ; -T66 : 'foreach' ; -T67 : 'drop' ; -T68 : 'do' ; -T69 : 'if' ; -T70 : 'else' ; -T71 : 'for' ; -T72 : 'iterate' ; -T73 : 'OclUndefined' ; -T74 : 'true' ; -T75 : 'false' ; -T76 : 'then' ; -T77 : 'endif' ; -T78 : 'super' ; -T79 : 'let' ; -T80 : 'Bag' ; -T81 : 'Set' ; -T82 : 'OrderedSet' ; -T83 : 'Sequence' ; -T84 : 'Map' ; -T85 : 'Tuple' ; -T86 : 'OclType' ; -T87 : 'OclAny' ; -T88 : 'TupleType' ; -T89 : 'Integer' ; -T90 : 'Real' ; -T91 : 'Boolean' ; -T92 : 'String' ; -T93 : 'Collection' ; -T94 : 'not' ; -T95 : 'div' ; -T96 : 'mod' ; -T97 : 'and' ; -T98 : 'or' ; -T99 : 'xor' ; -T100 : 'implies' ; - -// $ANTLR src "ATL_ANTLR3.g" 1089 -NL - : ( '\r' '\n' - | '\n' '\r' //Improbable - | '\r' - | '\n' - ) - {newline();} - ; - -// $ANTLR src "ATL_ANTLR3.g" 1098 -WS - : ( ' ' - | '\t' - ) - ; - -// $ANTLR src "ATL_ANTLR3.g" 1104 -fragment -DIGIT - : '0'..'9' - ; - -// $ANTLR src "ATL_ANTLR3.g" 1109 -fragment -ALPHA - : 'a'..'z' - | 'A'..'Z' - | '_' - //For Unicode compatibility (from 0000 to 00ff) - | '\u00C0' .. '\u00D6' - | '\u00D8' .. '\u00F6' - | '\u00F8' .. '\u00FF' - ; - -// $ANTLR src "ATL_ANTLR3.g" 1120 -fragment -SNAME -// options { -// testLiterals = true; -// } -// : (ALPHA) (ALPHA | DIGIT | {LA(2) == ':'}?':' ':')* -//TODO: : (ALPHA) (ALPHA | DIGIT | {input.LA(2) == ':'}?':' ':')* - : (ALPHA) (ALPHA | DIGIT)* -; - -// $ANTLR src "ATL_ANTLR3.g" 1130 -NAME - : ( - SNAME -// s:SNAME {if(s.getType() != SNAME) $setType(s.getType());} - | '"'! - ( ESC - | '\n' {newline();} - | ~('\\'|'\"'|'\n') - )* - '"'! - {setText(ei.unescapeString(getText(), 1));} - ) - ; - -// $ANTLR src "ATL_ANTLR3.g" 1144 -INT - : (DIGIT)+ - // cannot accept DIGIT '.' because it would conflict with Navigation -// (('.' DIGIT)=> '.' (DIGIT)+ {$setType(FLOAT);})? - (|{ ((input.LA(2) >= '0') && (input.LA(2) <= '9')) }? => '.' DIGIT+ {$type = FLOAT;}) - ; - // $ANTLR src "ATL_ANTLR3.g" 1150 -fragment FLOAT:; - -// $ANTLR src "ATL_ANTLR3.g" 1152 -fragment -ESC - : '\\'! - ( 'n' //{setText("\n");} - | 'r' //{setText("\r");} - | 't' //{setText("\t");} - | 'b' //{setText("\b");} - | 'f' //{setText("\f");} - | '"' //{setText("\"");} - | '\'' //{setText("\'");} - | '\\' //{setText("\\");} - | ( - ('0'..'3') - ( -// options { -// warnWhenFollowAmbig = false; -// } - : ('0'..'7') - ( -// options { -// warnWhenFollowAmbig = false; -// } - : '0'..'7' - )? - )? - | ('4'..'7') - ( -// options { -// warnWhenFollowAmbig = false; -// } - : ('0'..'7') - )? - ) - { -// String s = getText(); -// int i; -// int ret = 0; -// String ans; -// for (i=0; i<s.length(); ++i) -// ret = ret*8 + s.charAt(i) - '0'; -// ans = String.valueOf((char) ret); -// setText(ans); - } - ) - ; - - -// $ANTLR src "ATL_ANTLR3.g" 1199 -LSQUARE @init {} - : '[' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1207 -RSQUARE @init {} - : ']' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1215 -EXCL @init {} - : '!' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1223 -COMA @init {} - : ',' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1231 -LPAREN @init {} - : '(' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1239 -RPAREN @init {} - : ')' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1247 -LCURLY @init {} - : '{' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1255 -RCURLY @init {} - : '}' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1263 -SEMI @init {} - : ';' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1271 -COLON @init {} - : ':' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1279 -PIPE @init {} - : '|' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1287 -SHARP @init {} - : '#' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1295 -QMARK @init {} - : '?' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1303 -AROBAS @init {} - : '@' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1311 -POINT @init {} - : '.' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1319 -RARROW @init {} - : '->' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1327 -MINUS @init {} - : '-' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1335 -STAR @init {} - : '*' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1343 -SLASH @init {} - : '/' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1351 -PLUS @init {} - : '+' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1359 -EQ @init {} - : '=' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1367 -GT @init {} - : '>' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1375 -LT @init {} - : '<' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1383 -GE @init {} - : '>=' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1391 -LE @init {} - : '<=' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1399 -NE @init {} - : '<>' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1407 -LARROW @init {} - : '<-' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1415 -ASSIGNARROW @init {} - : '<:=' - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1423 -COMMENT @init {} - : (('--' (~('\r'| '\n'))*)) - { - - } - - ; - -// $ANTLR src "ATL_ANTLR3.g" 1431 -STRING @init {} - : (('\'' (options {greedy = false;} : (('\\'! ~ '\n')| '\n'| ~('\\'| '\n')))* '\'')) - { - - } - - ; diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/CompletionInformation.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/CompletionInformation.java index ad9b87a3..4059cbec 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/CompletionInformation.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/CompletionInformation.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ElementTrace.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ElementTrace.java index 9db65843..7fb14a31 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ElementTrace.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ElementTrace.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ModelAdapter.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ModelAdapter.java index 84512e78..abf999fe 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ModelAdapter.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ModelAdapter.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2004, 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ParserLauncher.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ParserLauncher.java index ca5a5a6d..b8b16eb5 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ParserLauncher.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ParserLauncher.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008, 2014 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ReferenceLocation.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ReferenceLocation.java index eb52e99e..a877befa 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ReferenceLocation.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/ReferenceLocation.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/TCSClassLoader.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/TCSClassLoader.java index 7e191d48..02782538 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/TCSClassLoader.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/TCSClassLoader.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/TCSRuntime.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/TCSRuntime.java index 2cf8f6b9..f7f292a5 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/TCSRuntime.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/TCSRuntime.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/ParserWrapper.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/ParserWrapper.java index 1a361617..4a6afc5c 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/ParserWrapper.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/ParserWrapper.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2004, 2008, 2014 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/antlr3/ANTLR3LocationToken.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/antlr3/ANTLR3LocationToken.java index 76700530..2493fa19 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/antlr3/ANTLR3LocationToken.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/antlr3/ANTLR3LocationToken.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2004, 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/antlr3/ParserWrapper.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/antlr3/ParserWrapper.java index f903b165..caaf0590 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/antlr3/ParserWrapper.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/tcs/injector/wrappers/antlr3/ParserWrapper.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2004, 2008, 2014 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/ByteArrayTextSource.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/ByteArrayTextSource.java index 3a9600f4..6b6ea0c0 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/ByteArrayTextSource.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/ByteArrayTextSource.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/IFileTextSource.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/IFileTextSource.java index fddb6814..ae830817 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/IFileTextSource.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/IFileTextSource.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/StringTextSource.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/StringTextSource.java index 077d7ef5..34c1f710 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/StringTextSource.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/StringTextSource.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/TextSource.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/TextSource.java index 5c82d967..66921d5b 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/TextSource.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/TextSource.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/URLTextSource.java b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/URLTextSource.java index cb7bd7f4..26ae4315 100644 --- a/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/URLTextSource.java +++ b/plugins/org.eclipse.m2m.atl.dsls/src/org/eclipse/m2m/atl/dsls/textsource/URLTextSource.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.emftvm-feature/build.properties b/plugins/org.eclipse.m2m.atl.emftvm-feature/build.properties index 06d1443f..1c4a68fd 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm-feature/build.properties +++ b/plugins/org.eclipse.m2m.atl.emftvm-feature/build.properties @@ -1,21 +1,22 @@ ################################################################################ # Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Vrije Universiteit Brussel - initial API and implementation ################################################################################ bin.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ - license.html + license.html,\ + copyright.txt src.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ - license.html - + license.html,\ + copyright.txt diff --git a/plugins/org.eclipse.m2m.atl.emftvm-feature/copyright.txt b/plugins/org.eclipse.m2m.atl.emftvm-feature/copyright.txt index 0e05ebd8..b6fd2641 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm-feature/copyright.txt +++ b/plugins/org.eclipse.m2m.atl.emftvm-feature/copyright.txt @@ -1,5 +1,6 @@ -Copyright (c) 2011-2014 Dennis Wagelaar, Vrije Universiteit Brussel. +Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. +Copyright (c) 2012-2021 Dennis Wagelaar. All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html
\ No newline at end of file +https://www.eclipse.org/legal/epl-2.0/
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm-feature/epl-v10.html b/plugins/org.eclipse.m2m.atl.emftvm-feature/epl-v10.html deleted file mode 100644 index f957f3e7..00000000 --- a/plugins/org.eclipse.m2m.atl.emftvm-feature/epl-v10.html +++ /dev/null @@ -1,259 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- saved from url=(0041)http://www.eclipse.org/legal/epl-v10.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -<style type="text/css"></style></head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to 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.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - - - -</body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.emftvm-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm-feature/feature.properties b/plugins/org.eclipse.m2m.atl.emftvm-feature/feature.properties index 42736245..8f120386 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm-feature/feature.properties +++ b/plugins/org.eclipse.m2m.atl.emftvm-feature/feature.properties @@ -1,12 +1,14 @@ ################################################################################ -# Copyright (c) 2011-2013 Vrije Universiteit Brussel. +# Copyright (c) 2011-2012 Vrije Universiteit Brussel. +# Copyright (c) 2012-2021 Dennis Wagelaar. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Vrije Universiteit Brussel - initial API and implementation +# Dennis Wagelaar ################################################################################ # "featureName" property - name of the feature featureName = ATL EMFTVM @@ -21,11 +23,12 @@ description = ATL EMFTVM. ModelingUpdateSiteName=Eclipse Modeling copyrightURL=copyright.txt -copyright=Copyright (c) 2011-2014 Dennis Wagelaar, Vrije Universiteit Brussel.\n\ +copyright=Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel.\n\ +Copyright (c) 2012-2021 Dennis Wagelaar.\n\ All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ # "licenseURL" property - URL of the "Feature License" # do not translate value - just change to point to a locale-specific HTML page @@ -35,125 +38,143 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 9, 2014\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## diff --git a/plugins/org.eclipse.m2m.atl.emftvm-feature/feature.xml b/plugins/org.eclipse.m2m.atl.emftvm-feature/feature.xml index 5437dd40..52dbb5b5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm-feature/feature.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm-feature/feature.xml @@ -2,12 +2,12 @@ <feature id="org.eclipse.m2m.atl.emftvm" label="%featureName" - version="4.1.0.qualifier" + version="4.10.0.qualifier" provider-name="%providerName" plugin="org.eclipse.m2m.atl.emftvm"> <description> - ATL EMFTVM + %description </description> <copyright url="%copyrightURL"> @@ -23,159 +23,12 @@ <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> </url> - <requires> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.emf.ecore" version="2.4.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.emf.ecore.xmi" version="2.4.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.m2m.atl.common" version="3.1.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.emf.validation" version="1.4.0" match="greaterOrEqual"/> - <import plugin="org.apache.ant" version="1.7.1" match="greaterOrEqual"/> - <import plugin="org.eclipse.ant.core" version="3.2.101" match="greaterOrEqual"/> - <import plugin="org.eclipse.core.resources" version="3.5.2" match="greaterOrEqual"/> - <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.m2m.atl.engine" version="3.1.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.m2m.atl.adt" version="3.1.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.m2m.atl.dsls" version="3.1.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.emf.edit"/> - <import plugin="org.eclipse.emf.ecore.edit"/> - <import plugin="org.eclipse.emf.edit.ui"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.debug.core" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.debug.ui" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.m2m.atl.core.ui" version="3.1.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.jface.text" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui.console" version="3.4.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.m2m.atl.adt.ui" version="3.1.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.m2m.atl.debug.core" version="3.1.0" match="greaterOrEqual"/> - <import plugin="org.objectweb.asm" version="5.0.1" match="greaterOrEqual"/> - </requires> + <includes + id="org.eclipse.m2m.atl.emftvm.engine" + version="0.0.0"/> - <plugin - id="org.eclipse.m2m.atl.emftvm" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.ant" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.ant.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.compiler" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.compiler.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.edit.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.editor" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.editor.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.launcher" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.launcher.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.trace" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.trace.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.trace.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.trace.edit.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.trace.editor" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2m.atl.emftvm.trace.editor.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + <includes + id="org.eclipse.m2m.atl.emftvm.ui" + version="0.0.0"/> </feature> diff --git a/plugins/org.eclipse.m2m.atl.emftvm-feature/license.html b/plugins/org.eclipse.m2m.atl.emftvm-feature/license.html index cecf137d..afb2f35c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm-feature/license.html +++ b/plugins/org.eclipse.m2m.atl.emftvm-feature/license.html @@ -1,106 +1,190 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<?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> -<style type="text/css"></style></head> +</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>
\ No newline at end of file + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/plugins/org.eclipse.m2m.atl.emftvm-feature/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm-feature/pom.xml index 1690bf62..f64cd4fa 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm-feature/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm-feature/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl.features</groupId> <artifactId>org.eclipse.m2m.atl.emftvm</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.ant/META-INF/MANIFEST.MF index e87a4bca..210e4c51 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.ant;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.apache.ant;bundle-version="1.7.1", diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/about.html b/plugins/org.eclipse.m2m.atl.emftvm.ant/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/about.html +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.ant/pom.xml index c21ef6f3..3ec170c5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/pom.xml @@ -3,9 +3,9 @@ Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -19,12 +19,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.ant</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -138,8 +138,7 @@ </goals> <configuration> <file>${project.build.directory}/standalone/org.eclipse.m2m.atl.emftvm.ant.standalone-${project.version}.jar</file> - <files>${project.build.directory}/standalone/org.eclipse.m2m.atl.emftvm.ant.standalone-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/standalone/org.eclipse.m2m.atl.emftvm.ant.standalone-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -176,8 +175,7 @@ </goals> <configuration> <file>${project.build.directory}/standalone/org.eclipse.m2m.atl.emftvm.ant.standalone-${project.version}.jar</file> - <files>${project.build.directory}/standalone/org.eclipse.m2m.atl.emftvm.ant.standalone-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/standalone/org.eclipse.m2m.atl.emftvm.ant.standalone-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src/org/eclipse/m2m/atl/emftvm/ant/EmftvmAntPlugin.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src/org/eclipse/m2m/atl/emftvm/ant/EmftvmAntPlugin.java index e1e6e0a1..7c12ad7f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src/org/eclipse/m2m/atl/emftvm/ant/EmftvmAntPlugin.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src/org/eclipse/m2m/atl/emftvm/ant/EmftvmAntPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/AntProjectHandler.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/AntProjectHandler.java index e9cd10da..4cf9e7b9 100755 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/AntProjectHandler.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/AntProjectHandler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/CompileTask.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/CompileTask.java index a9617265..c4bc37ca 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/CompileTask.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/CompileTask.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2018 Dennis Wagelaar. + * Copyright (c) 2018, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -13,11 +13,16 @@ package org.eclipse.m2m.atl.emftvm.ant; import java.io.BufferedInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.types.resources.FileResource; import org.eclipse.m2m.atl.common.ATLLogger; import org.eclipse.m2m.atl.core.ATLCoreException; import org.eclipse.m2m.atl.emftvm.compiler.AtlToEmftvmCompiler; @@ -33,17 +38,19 @@ public class CompileTask extends EMFTVMTask { private static final String DOT_ATL = ".atl"; private static final String DOT_EMFTVM = ".emftvm"; private static final double DIVISOR = 1.0E9; + private static final Pattern DOT_ATL_PAT = Pattern.compile("\\.atl$"); private String module; private String modulePath; private String charset; private String outputPath; + private final List<FileSet> moduleSets = new ArrayList<FileSet>(); + private AtlToEmftvmCompiler compiler; /** * Sets the module name. * - * @param module - * the module to set + * @param module the module to set */ public void setModule(String module) { this.module = module; @@ -62,8 +69,7 @@ public class CompileTask extends EMFTVMTask { * Sets the module path. If not set, * {@link org.apache.tools.ant.Project#getBaseDir()} is used. * - * @param modulePath - * the modulePath to set + * @param modulePath the modulePath to set */ public void setModulePath(String modulePath) { this.modulePath = modulePath; @@ -91,8 +97,7 @@ public class CompileTask extends EMFTVMTask { /** * Sets the character set to be used for parsing. * - * @param charset - * the character set to set + * @param charset the character set to set */ public void setCharset(String charset) { this.charset = charset; @@ -112,34 +117,80 @@ public class CompileTask extends EMFTVMTask { * Sets the directory path to write the output file to. If not set, * {@link #getModulePath()} is used. * - * @param outputPath - * the outputPath to set + * @param outputPath the outputPath to set */ public void setOutputPath(String outputPath) { this.outputPath = outputPath; } /** + * Returns the module {@link FileSet}. + * + * @return the moduleSets + */ + public List<FileSet> getModuleSets() { + return moduleSets; + } + + /** + * Adds module set to the compile task. + * + * @param moduleSet the module set to add + */ + public void addConfiguredModuleSet(FileSet moduleSet) { + getModuleSets().add(moduleSet); + } + + /** + * Returns the {@link AtlToEmftvmCompiler}. + * + * @return the compiler + */ + protected AtlToEmftvmCompiler getCompiler() { + if (compiler == null) { + compiler = new AtlToEmftvmCompiler(); + } + return compiler; + } + + /** * {@inheritDoc} */ @Override protected void innerExecute() throws Exception { + final String module = getModule(); + if (module != null) { + final File modulePath = trimToBaseDir(getModulePath()); + final Resource resource = new FileResource(modulePath, module + DOT_ATL); + compileResource(modulePath, resource); + } + + for (final FileSet moduleSet : getModuleSets()) { + final File dir = moduleSet.getDir(); + final File modulePath = dir == null ? getProject().getBaseDir() : dir; + for (final Resource resource : moduleSet) { + compileResource(modulePath, resource); + } + } + } + + private void compileResource(final File basedir, final Resource resource) throws Exception { final long startTimeNanos = System.nanoTime(); - final String modulePath = trimToBaseDir(getModulePath()); - final String module = getModule(); - final String inputFilePath = modulePath + module + DOT_ATL; - final AtlToEmftvmCompiler compiler = new AtlToEmftvmCompiler(); - final InputStream inputStream = new FileInputStream(inputFilePath); + final String modulePath = basedir + File.separator; + final String module = resource.getName(); + final String inputFilePath = modulePath + module; + final InputStream inputStream = resource.getInputStream(); try { final BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream); final String charset = getCharset(); final Reader reader = charset == null ? new InputStreamReader(bufferedInputStream) : new InputStreamReader(bufferedInputStream, charset); final String outputPath = getOutputPath(); - final String outputFilePath = (outputPath != null ? outputPath : modulePath) + module + DOT_EMFTVM; + final String outputFilePath = (outputPath != null ? outputPath : modulePath) + + DOT_ATL_PAT.matcher(module).replaceAll(DOT_EMFTVM); - final CompileTimeError[] errors = compiler.compile(reader, outputFilePath); + final CompileTimeError[] errors = getCompiler().compile(reader, outputFilePath); if (errors != null && errors.length > 0) { final StringBuilder errorString = new StringBuilder(); @@ -160,14 +211,13 @@ public class CompileTask extends EMFTVMTask { /** * Trims <code>null</code> strings to the project's BaseDir. * - * @param str - * the string to trim + * @param str the string to trim * @return <code>str</code>, or * {@link org.apache.tools.ant.Project#getBaseDir()} if * <code>null</code> */ - private String trimToBaseDir(final String str) { - return str != null ? str : getProject().getBaseDir().getPath() + File.separator; + private File trimToBaseDir(final String str) { + return str != null ? new File(str) : getProject().getBaseDir(); } } diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/EMFTVMBuildListener.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/EMFTVMBuildListener.java index be2ff6d7..7e479fd6 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/EMFTVMBuildListener.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/EMFTVMBuildListener.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/EMFTVMTask.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/EMFTVMTask.java index b9591829..f2e00d28 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/EMFTVMTask.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/EMFTVMTask.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InModel.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InModel.java index 824d777b..fdc4d94e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InModel.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InModelSet.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InModelSet.java new file mode 100644 index 00000000..1fabf4b7 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InModelSet.java @@ -0,0 +1,21 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.ant; + +/** + * Nested Ant input model element set. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class InModelSet extends ModelElementSet { + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InOutModel.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InOutModel.java index f0f56da2..696c2054 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InOutModel.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InOutModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InOutModelSet.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InOutModelSet.java new file mode 100644 index 00000000..03b28a37 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/InOutModelSet.java @@ -0,0 +1,71 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.ant; + +import java.io.File; + +/** + * Nested Ant input/output model element set. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class InOutModelSet extends ModelElementSet { + + private String suffix; + private File outputDir; + + /** + * Sets the model filename suffix. + * + * @param suffix the suffix to set + */ + public void setSuffix(String suffix) { + this.suffix = suffix; + } + + /** + * Returns the model filename suffix. + * + * @return the suffix + */ + public String getSuffix() { + return suffix; + } + + /** + * Returns the output directory. + * + * @return the outputDir + */ + public File getOutputDir() { + return outputDir; + } + + /** + * Sets the output directory. + * + * @param outputDir the outputDir to set + */ + public void setOutputDir(File outputDir) { + this.outputDir = outputDir; + } + + /** + * Returns the effective output directory (could be same as {@link #getDir()}. + * + * @return the outputDir + */ + public File getEffectiveOutputDir() { + return outputDir != null ? outputDir : getDir(); + } + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/LoadMetamodelTask.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/LoadMetamodelTask.java index 477d2320..28e4309b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/LoadMetamodelTask.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/LoadMetamodelTask.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -11,6 +12,7 @@ *******************************************************************************/ package org.eclipse.m2m.atl.emftvm.ant; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.m2m.atl.emftvm.EmftvmFactory; import org.eclipse.m2m.atl.emftvm.Metamodel; import org.eclipse.m2m.atl.emftvm.Model; @@ -19,7 +21,6 @@ import org.eclipse.m2m.atl.emftvm.util.EMFTVMUtil; /** * Loads a {@link Metamodel}. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> - * */ public class LoadMetamodelTask extends LoadModelTask { @@ -27,8 +28,8 @@ public class LoadMetamodelTask extends LoadModelTask { * {@inheritDoc} */ @Override - protected Model createModel() { - return EmftvmFactory.eINSTANCE.createMetamodel(); + protected Model createModel(final Resource resource) { + return EmftvmFactory.eINSTANCE.createMetamodel(resource); } /** diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/LoadModelTask.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/LoadModelTask.java index 562b58a3..94533873 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/LoadModelTask.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/LoadModelTask.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -95,11 +96,13 @@ public class LoadModelTask extends EMFTVMTask { } /** - * Creates a new {@link Model} instance. + * Creates a new {@link Model} instance for the given {@link Resource}. + * + * @param resource the {@link Resource} * @return a new {@link Model}. */ - protected Model createModel() { - return EmftvmFactory.eINSTANCE.createModel(); + protected Model createModel(Resource resource) { + return EmftvmFactory.eINSTANCE.createModel(resource); } /** @@ -128,8 +131,7 @@ public class LoadModelTask extends EMFTVMTask { if (r == null) { throw new IllegalArgumentException(String.format("Model with uri %s could not be found", uri)); } - final Model m = createModel(); - m.setResource(r); + final Model m = createModel(r); setModel(getName(), m); } diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/MetaModel.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/MetaModel.java index 900cd8a5..64510d51 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/MetaModel.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/MetaModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/ModelElement.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/ModelElement.java index 8d966e09..9e945f4e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/ModelElement.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/ModelElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/ModelElementSet.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/ModelElementSet.java new file mode 100644 index 00000000..65efb9de --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/ModelElementSet.java @@ -0,0 +1,75 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.ant; + +import org.apache.tools.ant.types.FileSet; + +/** + * Nested Ant model element set. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public abstract class ModelElementSet extends FileSet { + + private String name; + private String as; + private boolean allowInterModelReferences = true; + + /** + * Sets the model element name. + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * Returns the model element name. + * @return the name + */ + public String getName() { + return name; + } + + /** + * Returns the model element alias. + * @return the as + */ + public String getAs() { + return as; + } + + /** + * Sets the model element alias. + * @param as the as to set + */ + public void setAs(String as) { + this.as = as; + } + + /** + * Returns the allowInterModelReferences (default = <code>true</code>). + * @return the allowInterModelReferences + */ + public boolean isAllowInterModelReferences() { + return allowInterModelReferences; + } + + /** + * Sets the allowInterModelReferences with the allowInterModelReferences value. + * @param allowInterModelReferences the allowInterModelReferences to set + */ + public void setAllowInterModelReferences(boolean allowInterModelReferences) { + this.allowInterModelReferences = allowInterModelReferences; + } + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/NewModelTask.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/NewModelTask.java index 4308c168..e7cde6cc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/NewModelTask.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/NewModelTask.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -35,8 +36,7 @@ public class NewModelTask extends LoadModelTask { if (r == null) { throw new IllegalArgumentException(String.format("Model with uri %s could not be created", uri)); } - final Model m = createModel(); - m.setResource(r); + final Model m = createModel(r); setModel(getName(), m); } diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/OutModel.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/OutModel.java index 90b0a5f4..2cc54a6d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/OutModel.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/OutModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/OutModelSet.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/OutModelSet.java new file mode 100644 index 00000000..07d0f55c --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/OutModelSet.java @@ -0,0 +1,62 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.ant; + +import java.io.File; + +/** + * Nested Ant output model element set. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class OutModelSet extends ModelElement { + + private File dir; + private String suffix; + + /** + * Returns the base directory. + * + * @return the dir + */ + public File getDir() { + return dir; + } + + /** + * Sets the base directory. + * + * @param dir the dir to set + */ + public void setDir(File dir) { + this.dir = dir; + } + + /** + * Sets the model filename suffix. + * + * @param suffix the suffix to set + */ + public void setSuffix(String suffix) { + this.suffix = suffix; + } + + /** + * Returns the model filename suffix. + * + * @return the suffix + */ + public String getSuffix() { + return suffix; + } + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/RegisterMetamodelTask.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/RegisterMetamodelTask.java index 0f05f4f9..e7942e43 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/RegisterMetamodelTask.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/RegisterMetamodelTask.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2018 Dennis Wagelaar. + * Copyright (c) 2018, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -43,7 +43,8 @@ public class RegisterMetamodelTask extends EMFTVMTask { final String resourceFactoryClass = getResourceFactoryClass(); if (resourceFactoryClass != null) { final Class<?> resourceFactoryClazz = Class.forName(resourceFactoryClass); - final Resource.Factory resourceFactory = (Resource.Factory) resourceFactoryClazz.newInstance(); + final Resource.Factory resourceFactory = (Resource.Factory) resourceFactoryClazz.getDeclaredConstructor() + .newInstance(); final String fileExtension = getFileExtension(); if (fileExtension == null) { throw new IllegalArgumentException("File extension cannot be null if resource factory class is set"); diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/RunTask.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/RunTask.java index 2d503cd2..daf3a8f2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/RunTask.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/RunTask.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -11,10 +12,16 @@ *******************************************************************************/ package org.eclipse.m2m.atl.emftvm.ant; +import java.io.File; +import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; +import java.util.regex.Pattern; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; @@ -24,15 +31,36 @@ import org.eclipse.m2m.atl.emftvm.ExecEnv; import org.eclipse.m2m.atl.emftvm.Metamodel; import org.eclipse.m2m.atl.emftvm.Model; import org.eclipse.m2m.atl.emftvm.util.DefaultModuleResolver; +import org.eclipse.m2m.atl.emftvm.util.LazyList; import org.eclipse.m2m.atl.emftvm.util.TimingData; - /** * Runs a model transformation in the EMFTVM. + * * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class RunTask extends EMFTVMTask { + private static final Pattern FILE_EXT = Pattern.compile("\\.\\w+$"); + + private static String getBaseName(final org.apache.tools.ant.types.Resource resource) { + return FILE_EXT.matcher(resource.getName()).replaceAll(""); + } + + private static String generateFilename(final List<String> inputFileNames, final String suffix) { + final StringBuilder sb = new StringBuilder(); + for (final String fileName : inputFileNames) { + if (sb.length() > 0) { + sb.append("-"); + } + sb.append(fileName); + } + if (suffix != null) { + sb.append(suffix); + } + return sb.toString(); + } + private String module; private String modulePath; private boolean disableJIT; @@ -40,17 +68,22 @@ public class RunTask extends EMFTVMTask { private final List<InModel> inputModels = new ArrayList<InModel>(); private final List<InOutModel> inoutModels = new ArrayList<InOutModel>(); private final List<OutModel> outputModels = new ArrayList<OutModel>(); + private final List<InModelSet> inputModelSets = new ArrayList<InModelSet>(); + private final List<InOutModelSet> inoutModelSets = new ArrayList<InOutModelSet>(); + private final List<OutModelSet> outputModelSets = new ArrayList<OutModelSet>(); /** * Sets the module name. + * * @param module the module to set */ - public void setModule(String module) { + public void setModule(final String module) { this.module = module; } /** * Returns the module name. + * * @return the module */ public String getModule() { @@ -59,14 +92,16 @@ public class RunTask extends EMFTVMTask { /** * Sets the module path. + * * @param modulePath the modulePath to set */ - public void setModulePath(String modulePath) { + public void setModulePath(final String modulePath) { this.modulePath = modulePath; } /** * Returns the module path. + * * @return the modulePath */ public String getModulePath() { @@ -75,6 +110,7 @@ public class RunTask extends EMFTVMTask { /** * Returns whether to disable the JIT compiler. + * * @return whether to disable the JIT compiler */ public boolean isDisableJIT() { @@ -83,14 +119,16 @@ public class RunTask extends EMFTVMTask { /** * Sets whether to disable the JIT compiler + * * @param disableJIT whether to disable the JIT compiler */ - public void setDisableJIT(boolean disableJIT) { + public void setDisableJIT(final boolean disableJIT) { this.disableJIT = disableJIT; } /** * Returns the list of metamodels. + * * @return the metaModels */ public List<MetaModel> getMetaModels() { @@ -99,6 +137,7 @@ public class RunTask extends EMFTVMTask { /** * Returns the list of input models. + * * @return the inputModels */ public List<InModel> getInputModels() { @@ -107,6 +146,7 @@ public class RunTask extends EMFTVMTask { /** * Returns the list of in/out models. + * * @return the inoutModels */ public List<InOutModel> getInoutModels() { @@ -115,6 +155,7 @@ public class RunTask extends EMFTVMTask { /** * Returns the list of output models. + * * @return the outputModels */ public List<OutModel> getOutputModels() { @@ -122,38 +163,96 @@ public class RunTask extends EMFTVMTask { } /** + * Returns the list of input model sets. + * + * @return the inModelSets + */ + public List<InModelSet> getInputModelSets() { + return inputModelSets; + } + + /** + * Returns the list of input/output model sets. + * + * @return the inOutModelSets + */ + public List<InOutModelSet> getInoutModelSets() { + return inoutModelSets; + } + + /** + * Returns the list of output model sets. + * + * @return the outModelSets + */ + public List<OutModelSet> getOutputModelSets() { + return outputModelSets; + } + + /** * Adds metamodel to the run task. + * * @param metamodel the metamodel */ - public void addConfiguredMetamodel(MetaModel metamodel) { + public void addConfiguredMetamodel(final MetaModel metamodel) { getMetaModels().add(metamodel); } /** * Adds model as input model to the run task. + * * @param model the input model */ - public void addConfiguredInputModel(InModel model) { + public void addConfiguredInputModel(final InModel model) { getInputModels().add(model); } /** * Adds model as input/output model to the run task. + * * @param model the in/out model */ - public void addConfiguredInoutModel(InOutModel model) { + public void addConfiguredInoutModel(final InOutModel model) { getInoutModels().add(model); } /** * Adds model as output model to the run task. + * * @param model the output model */ - public void addConfiguredOutputModel(OutModel model) { + public void addConfiguredOutputModel(final OutModel model) { getOutputModels().add(model); } /** + * Adds model set as input model set to the run task. + * + * @param modelSet the input model set + */ + public void addConfiguredInputModelSet(final InModelSet modelSet) { + getInputModelSets().add(modelSet); + } + + /** + * Adds model as input/output model to the run task. + * + * @param modelSet the in/out model set + */ + public void addConfiguredInoutModelSet(final InOutModelSet modelSet) { + getInoutModelSets().add(modelSet); + } + + /** + * Adds model as output model to the run task. + * + * @param modelSet the output model set + */ + public void addConfiguredOutputModelSet(final OutModelSet modelSet) { + getOutputModelSets().add(modelSet); + } + + /** * {@inheritDoc} */ @Override @@ -173,13 +272,95 @@ public class RunTask extends EMFTVMTask { final TimingData timingData = new TimingData(); env.loadModule(resolver, getModule()); timingData.finishLoading(); - env.run(timingData); + + runForInputModelSet(env, timingData, getInputModelSets().iterator(), new LazyList<String>()); + timingData.finish(); log(timingData.toString()); } + private void runForInputModelSet(final ExecEnv env, final TimingData timingData, + final Iterator<InModelSet> inModelSets, final LazyList<String> inputFileNames) { + if (inModelSets.hasNext()) { + final ModelElementSet modelSet = inModelSets.next(); + for (final org.apache.tools.ant.types.Resource modelResource : modelSet) { + if (!modelResource.isDirectory()) { + final Model model = loadFromResource(modelSet.getDir(), modelResource); + env.registerInputModel(getModelKey(modelSet), model); + + runForInputModelSet(env, timingData, inModelSets, + inputFileNames.append(getBaseName(modelResource))); + + getResourceSet().getResources().remove(model.getResource()); + } + } + } else { + runForInOutModelSet(env, timingData, getInoutModelSets().iterator(), inputFileNames); + } + } + + private void runForInOutModelSet(final ExecEnv env, final TimingData timingData, + final Iterator<InOutModelSet> inOutModelSets, final LazyList<String> inputFileNames) { + if (inOutModelSets.hasNext()) { + final InOutModelSet modelSet = inOutModelSets.next(); + for (final org.apache.tools.ant.types.Resource modelResource : modelSet) { + if (!modelResource.isDirectory()) { + final Model model = modelResource.isExists() ? loadFromResource(modelSet.getDir(), modelResource) + : createFromResource(modelSet.getDir(), modelResource); + model.setAllowInterModelReferences(modelSet.isAllowInterModelReferences()); + env.registerInOutModel(getModelKey(modelSet), model); + + runForInOutModelSet(env, timingData, inOutModelSets, + inputFileNames.append(getBaseName(modelResource))); + + getResourceSet().getResources().remove(model.getResource()); + } + } + } else { + runForOutputModelSet(env, timingData, getOutputModelSets().iterator(), inputFileNames); + + for (final InOutModelSet inOutModelSet : getInoutModelSets()) { + final Model model = env.getInoutModels().get(getModelKey(inOutModelSet)); + final String suffix = inOutModelSet.getSuffix(); + model.getResource().setURI(URI.createFileURI(new File(inOutModelSet.getEffectiveOutputDir(), + generateFilename(inputFileNames, suffix != null ? suffix + : "." + model.getResource().getURI().fileExtension())).getPath())); + try { + model.getResource().save(Collections.emptyMap()); + } catch (final IOException e) { + throw new BuildException(e); + } + } + } + } + + private void runForOutputModelSet(final ExecEnv env, final TimingData timingData, + final Iterator<OutModelSet> outModelSets, final LazyList<String> inputFileNames) { + if (outModelSets.hasNext()) { + final OutModelSet outModelSet = outModelSets.next(); + final org.apache.tools.ant.types.Resource resource = new org.apache.tools.ant.types.Resource( + generateFilename(inputFileNames, outModelSet.getSuffix())); + final Model model = createFromResource(outModelSet.getDir(), resource); + model.setAllowInterModelReferences(outModelSet.isAllowInterModelReferences()); + env.registerOutputModel(getModelKey(outModelSet), model); + + runForOutputModelSet(env, timingData, outModelSets, inputFileNames); + + try { + model.getResource().save(Collections.emptyMap()); + } catch (final IOException e) { + throw new BuildException(e); + } finally { + getResourceSet().getResources().remove(model.getResource()); + } + } else { + env.run(timingData); + } + } + /** * Returns the {@link Model} for <code>me</code>. + * * @param me the {@link ModelElement} task parameter * @return the {@link Model} */ @@ -193,6 +374,7 @@ public class RunTask extends EMFTVMTask { /** * Returns the {@link Metamodel} for <code>me</code>. + * * @param mm the {@link MetaModel} task parameter * @return the {@link Metamodel} */ @@ -202,6 +384,7 @@ public class RunTask extends EMFTVMTask { /** * Returns the model name key to use in the {@link ExecEnv} for <code>me</code>. + * * @param me the {@link ModelElement} task parameter * @return the model name key */ @@ -213,6 +396,20 @@ public class RunTask extends EMFTVMTask { return as; } + /** + * Returns the model name key to use in the {@link ExecEnv} for <code>me</code>. + * + * @param me the {@link ModelElementSet} task parameter + * @return the model name key + */ + private String getModelKey(final ModelElementSet me) { + String as = me.getAs(); + if (as == null) { + as = me.getName(); + } + return as; + } + private void addInputModelsToEnv(final ExecEnv env) { for (final ModelElement me : getInputModels()) { env.registerInputModel(getModelKey(me), getModel(me)); @@ -228,8 +425,7 @@ public class RunTask extends EMFTVMTask { final String u = m.getUri(); final URI uri = u == null ? URI.createPlatformResourceURI(m.getWspath(), true) : URI.createURI(u); final Resource r = rs.createResource(uri); - model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(r); + model = EmftvmFactory.eINSTANCE.createModel(r); model.setAllowInterModelReferences(m.isAllowInterModelReferences()); setModel(m.getName(), model); } else { @@ -244,7 +440,9 @@ public class RunTask extends EMFTVMTask { uri = URI.createPlatformResourceURI(wsp, true); } if (uri != null) { - getProject().log(this, String.format("Changing the URI of in/out model '%s' before executing a transformation will break inter-model references ('%s' -> '%s')", m.getName(), model.getResource().getURI(), uri), Project.MSG_WARN); + getProject().log(this, String.format( + "Changing the URI of in/out model '%s' before executing a transformation will break inter-model references ('%s' -> '%s')", + m.getName(), model.getResource().getURI(), uri), Project.MSG_WARN); model.getResource().setURI(uri); } } @@ -258,8 +456,7 @@ public class RunTask extends EMFTVMTask { final String u = m.getUri(); final URI uri = u == null ? URI.createPlatformResourceURI(m.getWspath(), true) : URI.createURI(u); final Resource r = rs.createResource(uri); - final Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(r); + final Model model = EmftvmFactory.eINSTANCE.createModel(r); model.setAllowInterModelReferences(m.isAllowInterModelReferences()); setModel(m.getName(), model); env.registerOutputModel(getModelKey(m), model); @@ -272,4 +469,25 @@ public class RunTask extends EMFTVMTask { } } + private Model loadFromResource(final File dir, final org.apache.tools.ant.types.Resource resource) { + if (dir == null || !dir.isDirectory()) { + throw new IllegalArgumentException("Not a directory: " + dir); + } + final ResourceSet rs = getResourceSet(); + final Resource r = rs.getResource(URI.createFileURI(new File(dir, resource.getName()).getPath()), true); + if (r == null) { + throw new IllegalArgumentException( + String.format("Model with filename %s could not be found", resource.getName())); + } + return EmftvmFactory.eINSTANCE.createModel(r); + } + + private Model createFromResource(final File dir, final org.apache.tools.ant.types.Resource resource) { + if (dir == null || !dir.isDirectory()) { + throw new IllegalArgumentException("Not a directory: " + dir); + } + final ResourceSet rs = getResourceSet(); + final Resource r = rs.createResource(URI.createFileURI(new File(dir, resource.getName()).getPath())); + return EmftvmFactory.eINSTANCE.createModel(r); + } } diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/SaveModelTask.java b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/SaveModelTask.java index 9d945fd0..929532f9 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/SaveModelTask.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/src_ant/org/eclipse/m2m/atl/emftvm/ant/SaveModelTask.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/standalone/release/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.ant/standalone/release/pom.xml index 580144fb..cf816fff 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/standalone/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/standalone/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.ant.standalone</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> @@ -43,7 +43,7 @@ <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> - <version>[3.0,3.1)</version> + <version>[3.2,3.3)</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ant/standalone/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.ant/standalone/snapshot/pom.xml index e9172429..e1cb9221 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.ant/standalone/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.ant/standalone/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.ant.standalone</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> @@ -43,7 +43,7 @@ <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> - <version>[3.0,3.1)</version> + <version>[3.2,3.3)</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/.project b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/.project new file mode 100644 index 00000000..5cc37f11 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.m2m.atl.emftvm.cdo-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/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/build.properties b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/build.properties new file mode 100644 index 00000000..1c4a68fd --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/build.properties @@ -0,0 +1,22 @@ +################################################################################ +# Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# Contributors: +# Vrije Universiteit Brussel - initial API and implementation +################################################################################ +bin.includes = modeling32.png,\ + epl-v20.html,\ + feature.properties,\ + feature.xml,\ + license.html,\ + copyright.txt +src.includes = modeling32.png,\ + epl-v20.html,\ + feature.properties,\ + feature.xml,\ + license.html,\ + copyright.txt diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/copyright.txt b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/copyright.txt new file mode 100644 index 00000000..5ac4e953 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/copyright.txt @@ -0,0 +1,5 @@ +Copyright (c) 2021 Dennis Wagelaar. +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License v2.0 +which accompanies this distribution, and is available at +https://www.eclipse.org/legal/epl-2.0/
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/feature.properties b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/feature.properties new file mode 100644 index 00000000..c7df7cfb --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/feature.properties @@ -0,0 +1,177 @@ +################################################################################ +# Copyright (c) 2021 Dennis Wagelaar. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# Contributors: +# Dennis Wagelaar - initial API and implementation +################################################################################ +# "featureName" property - name of the feature +featureName = ATL EMFTVM CDO support + +# "providerName" property - name of the company that provides the feature +providerName = Eclipse Modeling Project + +# "description" property - description of the feature +description = ATL EMFTVM CDO support. + +# "updateSiteName" property - label for the update site +ModelingUpdateSiteName=Eclipse Modeling + +copyrightURL=copyright.txt +copyright=Copyright (c) 2021 Dennis Wagelaar.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ +which accompanies this distribution, and is available at\n\ +https://www.eclipse.org/legal/epl-2.0/ + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +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\ +\n\ +November 22, 2017\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + Installable Software.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ +\n\ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n +########### end of license property ########################################## diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/feature.xml b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/feature.xml new file mode 100644 index 00000000..ccb517e0 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/feature.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.m2m.atl.emftvm.cdo" + label="%featureName" + version="4.10.0.qualifier" + provider-name="%providerName" + plugin="org.eclipse.m2m.atl.emftvm.cdo"> + + <description> + %description + </description> + + <copyright url="%copyrightURL"> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <url> + <update label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + </url> + + <plugin + id="org.eclipse.m2m.atl.emftvm.cdo" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.cdo.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/license.html b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/license.html new file mode 100644 index 00000000..afb2f35c --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/license.html @@ -0,0 +1,190 @@ + +<?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>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/modeling32.png b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/modeling32.png Binary files differnew file mode 100644 index 00000000..6b08de2a --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/modeling32.png diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/pom.xml new file mode 100644 index 00000000..c11e4e91 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo-feature/pom.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2012 Obeo. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v2.0 + which accompanies this distribution, and is available at + https://www.eclipse.org/legal/epl-2.0/ + + Contributors: + Obeo - initial creator + --> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>m2m.atl-parent</artifactId> + <groupId>org.eclipse.m2m.atl</groupId> + <version>4.10.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> + </parent> + <groupId>org.eclipse.m2m.atl.features</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.cdo</artifactId> + <version>4.10.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> + +</project> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/.classpath b/plugins/org.eclipse.m2m.atl.emftvm.cdo/.classpath new file mode 100644 index 00000000..64c5e31b --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/.classpath @@ -0,0 +1,7 @@ +<?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.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/.project b/plugins/org.eclipse.m2m.atl.emftvm.cdo/.project new file mode 100644 index 00000000..faa08034 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.m2m.atl.emftvm.cdo</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.m2m.atl.emftvm.cdo/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..95221b95 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +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.release=disabled +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.cdo/META-INF/MANIFEST.MF new file mode 100644 index 00000000..2d983854 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/META-INF/MANIFEST.MF @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.cdo;singleton:=true +Bundle-Version: 4.10.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: %Bundle-Vendor +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0";visibility:=reexport, + org.eclipse.m2m.atl.emftvm;visibility:=reexport, + org.eclipse.emf.cdo;bundle-version="4.13.0", + org.eclipse.m2m.atl.common +Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.m2m.atl.emftvm.cdo +Export-Package: org.eclipse.m2m.atl.emftvm.cdo.impl diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.m2m.atl.emftvm.cdo/OSGI-INF/l10n/bundle.properties new file mode 100644 index 00000000..2298d3fe --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,3 @@ +#Properties file for org.eclipse.m2m.atl.emftvm.cdo +Bundle-Vendor = Eclipse Modeling Project +Bundle-Name = ATL EMFTVM CDO Adapter
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/about.html b/plugins/org.eclipse.m2m.atl.emftvm.cdo/about.html new file mode 100644 index 00000000..15c4457b --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/about.html @@ -0,0 +1,28 @@ +<!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>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>March 23rd, 2021</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/about.ini b/plugins/org.eclipse.m2m.atl.emftvm.cdo/about.ini new file mode 100755 index 00000000..d232c3d2 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/about.ini @@ -0,0 +1,14 @@ +# about.ini +# contains information about a feature +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# "%key" are externalized strings defined in about.properties +# This file does not need to be translated. + +# Property "aboutText" contains blurb for "About" dialog (translated) +aboutText=%aboutText + +# Property "featureImage" contains path to feature image (32x32) +featureImage=modeling32.png + +# Property "appName" contains name of the application (translated) +appName=%appName
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/about.properties b/plugins/org.eclipse.m2m.atl.emftvm.cdo/about.properties new file mode 100755 index 00000000..33ce52fe --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/about.properties @@ -0,0 +1,9 @@ +appName=EMFTVM CDO Support + +aboutText=EMFTVM CDO Support Plug-in\n\ +Version: {featureVersion}\n\ +\n\ +(c) Copyright 2021 Dennis Wagelaar.\n\ +\n\ +This plug-in provides support for ATL/EMFTVM optimized traversal of CDO models.\n\ +Visit: http://wiki.eclipse.org/ATL/EMFTVM
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/build.properties b/plugins/org.eclipse.m2m.atl.emftvm.cdo/build.properties new file mode 100644 index 00000000..dbe70212 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/build.properties @@ -0,0 +1,10 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + OSGI-INF/,\ + about.html,\ + about.ini,\ + about.properties,\ + modeling32.png diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.cdo/deploy/release/pom.xml new file mode 100644 index 00000000..2b8f1413 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/deploy/release/pom.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.cdo</artifactId> + <version>4.10.0</version> + <packaging>jar</packaging> + <licenses> + <license> + <name>Eclipse Public License - v 1.0</name> + <url>http://www.eclipse.org/org/documents/epl-v10.html</url> + </license> + </licenses> + <dependencies> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.ecore.xmi</artifactId> + <version>[2.4,3.0)</version> + </dependency> + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.cdo</artifactId> + <version>[4.0,5.0)</version> + </dependency> + </dependencies> +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.cdo/deploy/snapshot/pom.xml new file mode 100644 index 00000000..0e62624d --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/deploy/snapshot/pom.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.cdo</artifactId> + <version>4.10.0-SNAPSHOT</version> + <packaging>jar</packaging> + <licenses> + <license> + <name>Eclipse Public License - v 1.0</name> + <url>http://www.eclipse.org/org/documents/epl-v10.html</url> + </license> + </licenses> + <dependencies> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.ecore.xmi</artifactId> + <version>[2.4,3.0)</version> + </dependency> + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.cdo</artifactId> + <version>[4.0,5.0)</version> + </dependency> + </dependencies> +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/modeling32.png b/plugins/org.eclipse.m2m.atl.emftvm.cdo/modeling32.png Binary files differnew file mode 100644 index 00000000..6b08de2a --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/modeling32.png diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/plugin.xml b/plugins/org.eclipse.m2m.atl.emftvm.cdo/plugin.xml new file mode 100644 index 00000000..aeef1846 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/plugin.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + id="org.eclipse.m2m.atl.emftvm.cdo.impl.CDOModelFactory" + point="org.eclipse.m2m.atl.emftvm.modelfactory"> + <modelfactory + class="org.eclipse.m2m.atl.emftvm.cdo.impl.CDOModelFactoryImpl" + resourceType="org.eclipse.emf.cdo.eresource.CDOResource"> + </modelfactory> + </extension> + +</plugin> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.cdo/pom.xml new file mode 100644 index 00000000..12ba1fb2 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/pom.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2012 Obeo. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v2.0 + which accompanies this distribution, and is available at + https://www.eclipse.org/legal/epl-2.0/ + + Contributors: + Obeo - initial creator + --> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>m2m.atl-parent</artifactId> + <groupId>org.eclipse.m2m.atl</groupId> + <version>4.10.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> + </parent> + <groupId>org.eclipse.m2m.atl</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.cdo</artifactId> + <version>4.10.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>stable</id> + <activation> + <property> + <name>BUILD_TYPE</name> + <value>S</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <executions> + <execution> + <id>deploy-custom</id> + <phase>deploy</phase> + <goals> + <goal>deploy-file</goal> + </goals> + <configuration> + <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> + <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> + <url>${project.distributionManagement.snapshotRepository.url}</url> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <pomFile>${project.basedir}/deploy/snapshot/pom.xml</pomFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>release</id> + <activation> + <property> + <name>BUILD_TYPE</name> + <value>R</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <executions> + <execution> + <id>deploy-custom</id> + <phase>deploy</phase> + <goals> + <goal>deploy-file</goal> + </goals> + <configuration> + <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> + <repositoryId>${project.distributionManagement.repository.id}</repositoryId> + <url>${project.distributionManagement.repository.url}</url> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.releaseVersion}</version> + <packaging>jar</packaging> + <pomFile>${project.basedir}/deploy/release/pom.xml</pomFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOInstanceOfIterable.java b/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOInstanceOfIterable.java new file mode 100644 index 00000000..7efaa72c --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOInstanceOfIterable.java @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.cdo.impl; + +import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.cdo.view.CDOQuery; +import org.eclipse.emf.cdo.view.CDOView; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.net4j.util.collection.CloseableIterator; + +/** + * Makes the instances of the given {@link EClass} in a {@link CDOResource} + * available as an {@link Iterable}. + * + * Inspired by Epsilon's + * <a href="https://github.com/epsilonlabs/emc-cdo">emc-cdo</a>. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class CDOInstanceOfIterable implements Iterable<EObject> { + + private final CDOResource res; + private final EClass type; + + /** + * Creates a new {@link CDOInstanceOfIterable} around <code>res</code> and + * <code>type</code>. + * + * @param res the resource + * @param type the EClass + */ + public CDOInstanceOfIterable(final CDOResource res, final EClass type) { + this.res = res; + this.type = type; + } + + /** + * {@inheritDoc} + */ + public CloseableIterator<EObject> iterator() { + final CDOView cdoView = res.cdoView(); + final CDOQuery query = cdoView.createQuery(CDOProtocolConstants.QUERY_LANGUAGE_INSTANCES, null); + query.setParameter(CDOProtocolConstants.QUERY_LANGUAGE_INSTANCES_TYPE, type); + query.setParameter(CDOProtocolConstants.QUERY_LANGUAGE_INSTANCES_EXACT, false); + return query.getResultAsync(); + } + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOMetamodelImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOMetamodelImpl.java new file mode 100644 index 00000000..933af696 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOMetamodelImpl.java @@ -0,0 +1,86 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * 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: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.cdo.impl; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EClassifier; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.m2m.atl.common.ATLLogger; +import org.eclipse.m2m.atl.emftvm.EmftvmPackage; +import org.eclipse.m2m.atl.emftvm.Metamodel; +import org.eclipse.m2m.atl.emftvm.impl.MetamodelImpl; + +/** + * CDO implementation of {@link Metamodel}. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class CDOMetamodelImpl extends CDOModelImpl implements Metamodel { + + /** + * Lookup table of ((type name) -> (type)). + */ + protected Map<String, EClassifier> types; + + /** + * Set of ambiguous type names (more than one occurrence). + */ + protected Set<String> ambiguousTypes = new HashSet<String>(); + + /** + * Returns the {@link EClass} that correspond to this metaclass. + * + * @return the {@link EClass} that correspond to this metaclass. + */ + @Override + protected EClass eStaticClass() { + return EmftvmPackage.Literals.METAMODEL; + } + + /** + * {@inheritDoc} + */ + public synchronized EClassifier findType(final String typeName) { + if (types == null) { + types = createTypeTable(ambiguousTypes); + } + final EClassifier type = types.get(typeName); + if (type == null) { + throw new IllegalArgumentException(String.format("Type %s not found in metamodel %s", typeName, this)); + } + if (ambiguousTypes.contains(typeName)) { + ATLLogger.warning(String.format("Metamodel %s contains more than one type with name %s", this, typeName)); + } + return type; + } + + /** + * Returns a new type lookup table. + * + * @param ambiguousTypes the set of ambiguous type names (more than one + * occurrence) + * @return A new type lookup table. + */ + private Map<String, EClassifier> createTypeTable(final Set<String> ambiguousTypes) { + final Map<String, EClassifier> types = new HashMap<String, EClassifier>(); + final Resource res = getResource(); + assert res != null; + MetamodelImpl.registerTypeChain(types, res, null, new HashSet<Object>(), ambiguousTypes); + return types; + } + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOModelFactoryImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOModelFactoryImpl.java new file mode 100644 index 00000000..a4532826 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOModelFactoryImpl.java @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * 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: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.cdo.impl; + +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.m2m.atl.emftvm.Metamodel; +import org.eclipse.m2m.atl.emftvm.Model; +import org.eclipse.m2m.atl.emftvm.ModelFactory; + +/** + * CDO implementation for {@link ModelFactory}. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class CDOModelFactoryImpl implements ModelFactory { + + /** + * {@inheritDoc} + */ + public Model createModel(final Resource resource) { + final Model model = new CDOModelImpl(); + model.setResource(resource); + return model; + } + + /** + * {@inheritDoc} + */ + public Metamodel createMetamodel(final Resource resource) { + final Metamodel metaModel = new CDOMetamodelImpl(); + metaModel.setResource(resource); + return metaModel; + } + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOModelImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOModelImpl.java new file mode 100644 index 00000000..5f5db717 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.cdo/src/org/eclipse/m2m/atl/emftvm/cdo/impl/CDOModelImpl.java @@ -0,0 +1,160 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.cdo.impl; + +import java.util.ArrayList; +import java.util.Iterator; + +import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.m2m.atl.emftvm.Model; +import org.eclipse.m2m.atl.emftvm.impl.ModelImpl; +import org.eclipse.m2m.atl.emftvm.util.LazyList; +import org.eclipse.m2m.atl.emftvm.util.LazyList.NonCachingList; + +/** + * CDO implementation of {@link Model}. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class CDOModelImpl extends ModelImpl { + + /** + * {@link LazyList} that returns only instances within a given {@link Resource}. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ + public static class InResourceList extends NonCachingList<EObject> { + + /** + * {@link Iterator} for {@link InResourceList}. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ + public class InResourceIterator extends WrappedIterator { + + protected EObject next = null; + protected boolean nextSet = false; + + /** + * {@inheritDoc} + */ + @Override + public boolean hasNext() { + if (!nextSet && inner.hasNext()) { + next = inner.next(); // support null values for next + nextSet = true; + } + while (inner.hasNext() && (next == null || next.eResource() != resource)) { + next = inner.next(); + } + return nextSet && next != null && next.eResource() == resource; + } + + /** + * {@inheritDoc} + */ + @Override + public EObject next() { + if (!nextSet) { + next = inner.next(); // support null values for next + } else { + nextSet = false; + } + while (next.eResource() != resource) { + next = inner.next(); + } + assert !nextSet && next.eResource() == resource; + return next; + } + } + + protected final Resource resource; + + /** + * Creates a new {@link InResourceList} around <code>dataSource</code>. + * + * @param dataSource the underlying data source + * @param resource the resource of which to return the instances + */ + public InResourceList(final Iterable<EObject> dataSource, final Resource resource) { + super(dataSource); + this.resource = resource; + } + + /** + * {@inheritDoc} + */ + @Override + public Iterator<EObject> iterator() { + if (dataSource == null) { // cache complete + return cache.iterator(); + } + return new InResourceIterator(); + } + } + + /** + * {@inheritDoc} + */ + @Override + public void setResource(final Resource newResource) { + if (newResource != null && !(newResource instanceof CDOResource)) { + throw new IllegalArgumentException("Resource should be a CDOResource, but was: " + newResource); + } + super.setResource(newResource); + } + + /** + * {@inheritDoc} + */ + @Override + public LazyList<EObject> allInstancesOf(final EClass type) { + if (!allInstancesMap.containsKey(type)) { + allInstancesMap.put(type, + new InResourceList(new CDOInstanceOfIterable((CDOResource) getResource(), type), getResource())); + } + return allInstancesMap.get(type); + } + + /** + * {@inheritDoc} + */ + @Override + public EObject newElement(final EClass type) { + final EObject instance = type.getEPackage().getEFactoryInstance().create(type); + getResource().getContents().add(instance); + assert instance.eResource() == getResource(); + return instance; + } + + /** + * {@inheritDoc} + */ + @Override + public void deleteElement(final EObject element) { + assert getResource() == element.eResource(); + final EList<EObject> resContents = getResource().getContents(); + if (!resContents.remove(element)) { + throw new IllegalArgumentException( + String.format("Element %s not contained as a root element in this model", element)); + } + for (final EObject child : new ArrayList<EObject>(element.eContents())) { + assert child.eResource() == null; + // adding children to a container removes them from their previous container + resContents.add(child); + } + } +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.compiler/META-INF/MANIFEST.MF index 30f36f8c..57ad0ed1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.compiler;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.resources;bundle-version="3.5.2", diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/about.html b/plugins/org.eclipse.m2m.atl.emftvm.compiler/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/about.html +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/build.properties b/plugins/org.eclipse.m2m.atl.emftvm.compiler/build.properties index 68e7a5a4..dc390043 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/build.properties +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/build.properties @@ -11,7 +11,13 @@ bin.includes = META-INF/,\ transformations/ATLtoEMFTVM.atl,\ transformations/EMFTVMCopy.atl,\ transformations/InlineCodeblocks.atl,\ - transformations/OCLtoEMFTVM.atl + transformations/OCLtoEMFTVM.atl,\ + transformations/ATLSearchPlan.atl,\ + transformations/ATLSearchPlan.emftvm,\ + transformations/OCLLib.atl,\ + transformations/OCLLib.emftvm,\ + transformations/Annotations.atl,\ + transformations/Annotations.emftvm source.. = src/ output.. = bin/ src.includes = transformations/ATLWFR.atl,\ diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.compiler/deploy/release/pom.xml index 996d2bab..83bb44ea 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.compiler</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.compiler/deploy/snapshot/pom.xml index 6b0ab2f8..5507db91 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.compiler</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.compiler/pom.xml index 2fd206a7..862ecc3b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.compiler</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlResourceFactoryImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlResourceFactoryImpl.java index 0b58aba8..3b330b0d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlResourceFactoryImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlResourceFactoryImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlResourceImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlResourceImpl.java index 20ed3d16..7cd4a5f5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlResourceImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlResourceImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlToEmftvmCompiler.java b/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlToEmftvmCompiler.java index 457f144d..04c754fc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlToEmftvmCompiler.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/AtlToEmftvmCompiler.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. - * Copyright (c) 2017-2018 Dennis Wagelaar. + * Copyright (c) 2017, 2018, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -58,13 +58,13 @@ import org.eclipse.m2m.atl.engine.parser.AtlParser; /** * Invokes the ATL to EMFTVM compiler. - * + * * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class AtlToEmftvmCompiler implements AtlStandaloneCompiler { protected final ResourceSet rs = new ResourceSetImpl(); - protected final Metamodel pbmm = EmftvmFactory.eINSTANCE.createMetamodel(); + protected final Metamodel pbmm; protected final ExecEnvPool atlWfrPool = new ExecEnvPool(); protected final ExecEnvPool atlToEmftvmPool = new ExecEnvPool(); protected final ExecEnvPool inlineCodeblocksPool = new ExecEnvPool(); @@ -80,9 +80,10 @@ public class AtlToEmftvmCompiler implements AtlStandaloneCompiler { */ rs.getResourceFactoryRegistry().getExtensionToFactoryMap().put("emftvm", new EMFTVMResourceFactoryImpl()); - final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(); - atlmm.setResource(((EMFReferenceModel) AtlParser.getDefault().getAtlMetamodel()).getResource()); - pbmm.setResource(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); + final Metamodel atlmm = EmftvmFactory.eINSTANCE + .createMetamodel(((EMFReferenceModel) AtlParser.getDefault().getAtlMetamodel()).getResource()); + pbmm = EmftvmFactory.eINSTANCE + .createMetamodel(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); final ModuleResolverFactory mrf = createModuleResolverFactory(); atlWfrPool.setModuleResolverFactory(mrf); @@ -102,7 +103,7 @@ public class AtlToEmftvmCompiler implements AtlStandaloneCompiler { /** * Creates a new {@link ModuleResolverFactory}. - * + * * @return a new {@link ModuleResolverFactory} */ protected ModuleResolverFactory createModuleResolverFactory() { @@ -115,7 +116,7 @@ public class AtlToEmftvmCompiler implements AtlStandaloneCompiler { public ModuleResolver createModuleResolver() { return new ClassModuleResolver(getClass()) { @Override - public Module resolveModule(String module) throws ModuleNotFoundException { + public Module resolveModule(final String module) throws ModuleNotFoundException { return super.resolveModule("/transformations/" + module); } }; @@ -211,16 +212,13 @@ public class AtlToEmftvmCompiler implements AtlStandaloneCompiler { public EObject[] compileWithProblemModel(final IModel atlModel, final OutputStream outputStream) { final List<EObject> pbs = new ArrayList<EObject>(); - final Model atlm = EmftvmFactory.eINSTANCE.createModel(); - atlm.setResource(((EMFModel) atlModel).getResource()); + final Model atlm = EmftvmFactory.eINSTANCE.createModel(((EMFModel) atlModel).getResource()); final Resource pr = rs.createResource(URI.createFileURI("problems.xmi")); - final Model pbm = EmftvmFactory.eINSTANCE.createModel(); - pbm.setResource(pr); + final Model pbm = EmftvmFactory.eINSTANCE.createModel(pr); final Resource r = rs.createResource(URI.createFileURI("out.emftvm"), "org.eclipse.m2m.atl.emftvm"); - final Model emftvmm = EmftvmFactory.eINSTANCE.createModel(); - emftvmm.setResource(r); + final Model emftvmm = EmftvmFactory.eINSTANCE.createModel(r); final ExecEnv atlWfrEnv = atlWfrPool.getExecEnv(); final ExecEnv atlToEmftvmEnv = atlToEmftvmPool.getExecEnv(); @@ -281,7 +279,7 @@ public class AtlToEmftvmCompiler implements AtlStandaloneCompiler { /** * Retrieves problem elements from <code>problems</code>. - * + * * @param problems * the problems model * @param pbElements @@ -309,7 +307,7 @@ public class AtlToEmftvmCompiler implements AtlStandaloneCompiler { /** * Retrieves problem elements from <code>problems</code>. - * + * * @param problems * the problems model * @param pbElements diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/EmftvmCompilerPlugin.java b/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/EmftvmCompilerPlugin.java index 167b4a6f..5f0a56df 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/EmftvmCompilerPlugin.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/src/org/eclipse/m2m/atl/emftvm/compiler/EmftvmCompilerPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.atl b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.atl new file mode 100644 index 00000000..3255b628 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.atl @@ -0,0 +1,152 @@ +-- @atlcompiler emftvm +-- @path ATL=/org.eclipse.m2m.atl.common/model/ATL.ecore +-- @lib OCLLib=/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.atl +-- Helpers for generating ATL local search plans +library ATLSearchPlan; + +uses OCLLib; + +--- Returns this OclExpression as a Sequence of sub-expressions to be combined in a conjuction (and) +helper context OclAny def : asConjunction : Sequence(ATL!OclExpression) = + Sequence{}; + +--- Returns this OclExpression as a Sequence of sub-expressions to be combined in a conjuction (and) +helper context ATL!OclExpression def : asConjunction : Sequence(ATL!OclExpression) = + Sequence{self}; + +--- Returns this OclExpression as a Sequence of sub-expressions to be combined in a conjuction (and) +helper context ATL!OperatorCallExp def : asConjunction : Sequence(ATL!OclExpression) = + if not self.isStatic and self.operationName = 'and' then + Sequence{self.source.asConjunction, self.arguments->first().asConjunction}->flatten() + else + super.asConjunction + endif; + +--- Returns the VariableExp that self can use as an InputRuleElement.binding, or OclUndefined +helper context ATL!CollectionOperationCallExp def : canBindWith : ATL!InPatternElement = + if not self.isStatic and self.operationName = 'includes' and self.arguments->size() = 1 then + self.arguments->first().inPatternElement + else + super.canBindWith + endif; + +--- Returns the VariableExp that self can use as an InputRuleElement.binding, or OclUndefined +helper context ATL!OperatorCallExp def : canBindWith : ATL!InPatternElement = + if not self.isStatic and self.operationName = '=' and self.arguments->size() = 1 then + if self.source.inPatternElement.oclIsUndefined() then + self.arguments->first().inPatternElement + else + self.source.inPatternElement + endif + else + super.canBindWith + endif; + +--- Returns the sub-expression of this OclExpression that should be evaluated for the InputRuleElement.binding, or OclUndefined +helper context ATL!CollectionOperationCallExp def : bindingSubExp : ATL!OclExpression = + if self.canBindWith.oclIsUndefined() then + super.bindingSubExp + else + self.source + endif; + +--- Returns the sub-expression of this OclExpression that should be evaluated for the InputRuleElement.binding, or OclUndefined +helper context ATL!OperatorCallExp def : bindingSubExp : ATL!OclExpression = + if self.canBindWith.oclIsUndefined() then + super.bindingSubExp + else + if self.source.inPatternElement.oclIsUndefined() then + self.source + else + self.arguments->first() + endif + endif; + +--- Returns the contained VariableExp instances that reference InPatternElements +helper context OclAny def : references : Set(ATL!VariableExp) = + Set{}; + +--- Returns the contained VariableExp instances that reference InPatternElements +helper context ATL!OclExpression def : references : Set(ATL!VariableExp) = + self.eContents()->collect(c | c.references)->flatten(); + +--- Returns the contained VariableExp instances that reference InPatternElements +helper context ATL!VariableExp def : references : Set(ATL!VariableExp) = + if self.inPatternElement.oclIsUndefined() then + super.references + else + Set{self.inPatternElement} + endif; + +--- Returns the InPatternElement that self refers to, or OclUndefined +helper context ATL!VariableExp def : inPatternElement : ATL!InPatternElement = + if self.referredVariable.oclIsKindOf(ATL!InPatternElement) then + self + else + OclUndefined + endif; + +--- Returns all possible InputRuleElement bindings for self +helper context ATL!InPatternElement def : bindings : Sequence(ATL!OclExpression) = + let successors : Sequence(ATL!InPatternElement) = + self.inPattern.elements + ->subSequence(self.inPattern.elements->indexOf(self), self.inPattern.elements->size()) + ->select(s | s = self or s.bindings->notEmpty()) + in + self.inPattern.filter.asConjunction + ->reject(exp | exp.canBindWith.oclIsUndefined()) + ->reject(exp | + let otherReferences : Set(ATL!VariableExp) = + exp.references->excluding(exp.canBindWith) + in + otherReferences->exists(r | successors->includes(r.referredVariable)) + ) + ->select(exp | exp.canBindWith.referredVariable = self); + +--- Returns the containing ATL rule, or OclUndefined. +helper context OclAny def : containingRule : ATL!Rule = + let parent : OclAny = self.refImmediateComposite() in + if parent.oclIsKindOf(ATL!Rule) then parent + else if not parent.oclIsUndefined() then parent.containingRule + else OclUndefined + endif endif; + +--- Returns all InputRuleElement bindings for this rule. +helper context ATL!MatchedRule def : allBindings : Map(ATL!OclExpression, ATL!InPatternElement) = + let filter : Sequence(ATL!OclExpression) = self.inPattern.filter.asConjunction in + let inPatternElementsWithBindings : Sequence(ATL!InPatternElement) = + self.inPattern.elements + ->select(e | e.bindings->notEmpty()) in + let allBindings : Set(ATL!OclExpression) = + inPatternElementsWithBindings + ->collect(e | e.bindings->first()) + ->asSet() in + let allBindingsReduced : Set(ATL!OclExpression) = + allBindings->reject(exp | + let expIndex : Integer = filter->indexOf(exp) in + filter->exists(o | not allBindings->includes(o) and filter->indexOf(o) < expIndex) + ) in + inPatternElementsWithBindings + ->select(e | allBindingsReduced->includes(e.bindings->first())) + ->mappedBySingle(e | e.bindings->first()); + +--- Returns the InputRuleElement for which this OCL expression is part of its binding, or OclUndefined. +helper context ATL!OclExpression def : partOfBindingFor : ATL!InPatternElement = + if self.containingRule.oclIsTypeOf(ATL!MatchedRule) then + let ipe : ATL!InPatternElement = self.containingRule.allBindings.get(self) in + if ipe.oclIsUndefined() then + self.refImmediateComposite().partOfBindingFor + else + ipe + endif + else + super.partOfBindingFor + endif; + +--- Returns 'true' if this OCL expression contains an InputRuleElement binding. +helper context ATL!OperatorCallExp def : containsBinding : Boolean = + if not self.isStatic and self.operationName = 'and' then + self.source.isBinding or self.arguments->first().isBinding + else + super.containsBinding + endif; diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.emftvm b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.emftvm Binary files differnew file mode 100644 index 00000000..5c3d3c74 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.emftvm diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLWFR.atl b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLWFR.atl index 74a38c75..4bbe4fff 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLWFR.atl +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLWFR.atl @@ -1,9 +1,12 @@ -- @atlcompiler emftvm -- @path ATL=/org.eclipse.m2m.atl.common/model/ATL.ecore -- @path Problem=/org.eclipse.m2m.atl.common/model/Problem.ecore +-- @lib Annotations=/org.eclipse.m2m.atl.emftvm.compiler/transformations/Annotations.atl module ATLWFR; create OUT : Problem from IN : ATL; +uses Annotations; + ------------------------------------------------------------------------------- -- HELPERS -------------------------------------------------------------------- ------------------------------------------------------------------------------- @@ -379,6 +382,26 @@ helper context ATL!LocatedElement def: getRootComposite() : OclAny = endif endif; +-- This helper returns the rule (container) of the contextual +-- OclExpression, or OclUndefined if the OclExpression is not +-- contained in a rule. +-- CONTEXT: ATL!LocatedElement +-- RETURN: OclAny +helper context ATL!LocatedElement def: "rule" : OclAny = + let container : OclAny = self.refImmediateComposite() + in + if container.oclIsUndefined() + then + OclUndefined + else + if container.oclIsKindOf(ATL!Rule) + then + container + else + container."rule" + endif + endif; + -- These helpers check for value equality of OclTypes. -- The base case evaluates to "false", and covers the case of -- comparing to OclUndefined. @@ -927,6 +950,20 @@ nodefault rule RefiningRuleInRegularMode { ) } +nodefault rule RecursiveRuleInRegularMode { + from + s : ATL!MatchedRule ( + s.isRecursive and + not s."module".isRefining + ) + to + t : Problem!Problem ( + severity <- #error, + location <- s.location, + description <- 'Recursive rules are only allowed in refining mode' + ) +} + nodefault rule NoOutPatternElementReferenceInInPattern { from s : ATL!VariableExp ( @@ -940,3 +977,32 @@ nodefault rule NoOutPatternElementReferenceInInPattern { description <- 'Cannot refer to target element \'' + s.referredVariable.varName + '\' in a \'from\' clause' ) } + +nodefault rule NoSuperRuleVariableReference { + from + s : ATL!VariableExp ( + not s.referredVariable."rule".oclIsUndefined() and + not s."rule".oclIsUndefined() and + s.referredVariable."rule" <> s."rule" + ) + to + t : Problem!Problem ( + severity <- #error, + location <- s.location, + description <- 'Cannot refer to \'' + s.referredVariable.varName + '\' from another rule' + ) +} + +nodefault rule ExtendsAnnotationWithExtendsKeyword { + from + s : ATL!MatchedRule ( + not s.superRule.oclIsUndefined() and + s.extendsAnnValues->notEmpty() + ) + to + t : Problem!Problem ( + severity <- #error, + location <- s.location, + description <- 'Cannot combine the \'@extends\' annotation with the \'extends\' keyword' + ) +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLWFR.emftvm b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLWFR.emftvm Binary files differindex e80c4327..3bd8aa57 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLWFR.emftvm +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLWFR.emftvm diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl index 88966866..234eaa94 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl @@ -2,12 +2,17 @@ -- @nsURI EMFTVM=http://www.eclipse.org/m2m/atl/2011/EMFTVM -- @path ATL=/org.eclipse.m2m.atl.common/model/ATL.ecore -- @path Problem=/org.eclipse.m2m.atl.common/model/Problem.ecore +-- @lib OCLtoEMFTVM=/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.atl +-- @lib ATLSearchPlan=/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.atl +-- @lib Annotations=/org.eclipse.m2m.atl.emftvm.compiler/transformations/Annotations.atl -- Transforms ATL modules into EMFTVM modules module ATLtoEMFTVM; create OUT : EMFTVM, PBS : Problem from IN : ATL; uses OCLtoEMFTVM; +uses ATLSearchPlan; +uses Annotations; -- ====================================================================== -- helpers begin @@ -137,21 +142,6 @@ helper context ATL!Rule def : applyLoc : ATL!LocatedElement = self.outPattern endif; ---- Support for multiple rule inheritance, including rules outside same module -helper context String def : isExtendsAnn : Boolean = - self.substring(3).trim().startsWith('@extends'); - ---- Returns the '@extends' values for a given annotation string. -helper context String def : extendsAnnValues : Sequence(String) = - if self.isExtendsAnn then - self.split('@extends') - ->at(2).trim().split(',') - ->collect(s | s.trim()) - else - Sequence{} - endif; - - --- Returns 'true' if self is an output model that refines an input model in a refining mode module. helper context ATL!OclModel def : isRefiningModel : Boolean = let p : OclAny = self.refImmediateComposite() in @@ -434,7 +424,8 @@ rule InPatternElement { rule InPatternElementWithFilter extends InPatternElement { from s : ATL!InPatternElement in IN ( - not s.inPattern.filter.oclIsUndefined()) + not s.inPattern.filter.oclIsUndefined() and + not s.inPattern.filter.firstNonBindingExp.oclIsUndefined()) to re : EMFTVM!InputRuleElement, lv : EMFTVM!LocalVariable ( name <- s.varName, @@ -442,6 +433,31 @@ rule InPatternElementWithFilter extends InPatternElement { typeModel <- s.type.modelName) } +rule InPatternElementWithBinding extends InPatternElement { + from s : ATL!InPatternElement in IN ( + not s.inPattern.filter.oclIsUndefined() and + s.bindings->notEmpty() and + s.inPattern."rule".allBindings.containsValue(s)) + using { + bindingLoc : ATL!LocatedElement = s.bindings->first().bindingSubExp; + } + to re : EMFTVM!InputRuleElement ( + binding <- ieb), + ieb : EMFTVM!CodeBlock ( + lineNumbers <:= Sequence{iebln}, + localVariables <- s.inPattern.elements + ->collect(e|thisModule.InPatternElementBindingVariable(s, e)), + nested <- Sequence{bindingLoc}, + code <:= Sequence{invokeCb}), + iebln : EMFTVM!LineNumber ( + startLine <- bindingLoc.startLine, + startColumn <- bindingLoc.startColumn, + endLine <- bindingLoc.endLine, + endColumn <- bindingLoc.endColumn, + instructions <:= Sequence{invokeCb}), + invokeCb : EMFTVM!InvokeCb (codeBlock <- bindingLoc) +} + rule InPatternElementWithAction extends InPatternElement { from s : ATL!InPatternElement in IN ( not s.inPattern."rule".actionBlock.oclIsUndefined()) @@ -452,6 +468,11 @@ rule InPatternElementWithAction extends InPatternElement { typeModel <- s.type.modelName) } +-- @extends InPatternElementWithFilter, InPatternElementWithBinding +rule InPatternElementWithBindingFilter { + from s : ATL!InPatternElement in IN + to re : EMFTVM!InputRuleElement +} -- @extends InPatternElementWithFilter, InPatternElementWithAction rule InPatternElementWithFilterAndAction { @@ -459,6 +480,18 @@ rule InPatternElementWithFilterAndAction { to re : EMFTVM!InputRuleElement } +-- @extends InPatternElementWithBinding, InPatternElementWithAction +rule InPatternElementWithBindingAndAction { + from s : ATL!InPatternElement in IN + to re : EMFTVM!InputRuleElement +} + +-- @extends InPatternElementWithBindingFilter, InPatternElementWithFilterAndAction, InPatternElementWithBindingAndAction +rule InPatternElementWithBindingFilterAndAction { + from s : ATL!InPatternElement in IN + to re : EMFTVM!InputRuleElement +} + rule OutPatternElement { from s : ATL!OutPatternElement in IN ( let r : ATL!Rule = s.outPattern."rule" in @@ -660,7 +693,7 @@ rule MatchedRule { "abstract" <- s.isAbstract, superRules <- if s.superRule.oclIsUndefined() then - s.commentsBefore->collect(c | c.extendsAnnValues)->flatten() + s.extendsAnnValues else Sequence{s.superRule.name} endif, @@ -673,12 +706,14 @@ rule MatchedRule { mode <- if s.oclIsKindOf(ATL!LazyMatchedRule) then #manual + else if s.isRecursive then + #automaticRecursive else #automaticSingle - endif, - default <- s.isDefault, + endif endif, + default <- s.isDefault and not s.isRecursive, "unique" <- (s.oclIsKindOf(ATL!LazyMatchedRule) and s.isUnique) or s.isNoDefault, - distinctElements <- false, + distinctElements <- s.isDistinct, inputElements <- s.inPattern.elements, fields <- s.variables, applier <- a), @@ -721,16 +756,17 @@ rule MatchedRule { rule MatchedRuleWithFilter extends MatchedRule { from s : ATL!MatchedRule in IN ( - not s.inPattern.filter.oclIsUndefined()) + not s.inPattern.filter.oclIsUndefined() and + not s.inPattern.filter.firstNonBindingExp.oclIsUndefined()) using { - matchLoc : ATL!LocatedElement = s.inPattern.filter; + matchLoc : ATL!LocatedElement = s.inPattern.filter.firstNonBindingExp; } to t : EMFTVM!Rule ( matcher <- m), m : EMFTVM!CodeBlock ( lineNumbers <:= Sequence{mln}, localVariables <- s.inPattern.elements->collect(e|thisModule.resolveTemp(e, 'lv')), - nested <- Sequence{s.inPattern.filter}, + nested <- Sequence{matchLoc}, code <:= Sequence{invokeCb}), mln : EMFTVM!LineNumber ( startLine <- matchLoc.startLine, @@ -738,7 +774,7 @@ rule MatchedRuleWithFilter extends MatchedRule { endLine <- matchLoc.endLine, endColumn <- matchLoc.endColumn, instructions <:= Sequence{invokeCb}), - invokeCb : EMFTVM!InvokeCb (codeBlock <- s.inPattern.filter) + invokeCb : EMFTVM!InvokeCb (codeBlock <- matchLoc) } rule MatchedRuleWithAction extends MatchedRule { diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.emftvm b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.emftvm Binary files differindex b3b29a6b..c120e694 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.emftvm +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.emftvm diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/Annotations.atl b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/Annotations.atl new file mode 100644 index 00000000..ed9483ad --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/Annotations.atl @@ -0,0 +1,37 @@ +-- @atlcompiler emftvm +-- @path ATL=/org.eclipse.m2m.atl.common/model/ATL.ecore +library Annotations; + +--- Support for multiple rule inheritance, including rules outside same module +helper context String def : isAnn(ann : String) : Boolean = + self.substring(3).trim().startsWith('@' + ann); + +--- Returns the '@extends' values for a given annotation string. +helper context String def : annValues(ann : String) : Sequence(String) = + if self.isAnn(ann) then + self.split('@' + ann) + ->at(2).trim().split(',') + ->collect(s | s.trim()) + else + Sequence{} + endif; + +--- Returns whether self is annotated with '@<ann>'. +helper context ATL!LocatedElement def : isAnn(ann : String) : Boolean = + self.commentsBefore->exists(c | c.isAnn(ann)); + +--- Returns the '@<ann>' values for a given annotation string. +helper context ATL!LocatedElement def : annValues(ann : String) : Sequence(String) = + self.commentsBefore->collect(c | c.annValues(ann))->flatten(); + +--- Returns the '@extends' values for a given annotation string. +helper context ATL!LocatedElement def : extendsAnnValues : Sequence(String) = + self.annValues('extends'); + +--- Returns whether self is annotated with '@recursive'. +helper context ATL!LocatedElement def : isRecursive : Boolean = + self.isAnn('recursive'); + +--- Returns whether self is annotated with '@recursive'. +helper context ATL!LocatedElement def : isDistinct : Boolean = + self.isAnn('distinct'); diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/Annotations.emftvm b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/Annotations.emftvm Binary files differnew file mode 100644 index 00000000..8b68b93b --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/Annotations.emftvm diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.atl b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.atl new file mode 100644 index 00000000..ab5aee4e --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.atl @@ -0,0 +1,75 @@ +-- @atlcompiler emftvm +-- @path ATL=/org.eclipse.m2m.atl.common/model/ATL.ecore +-- OCL helpers +library OCLLib; + +--- Returns 'true' if self is considered static, 'false' otherwise. +helper context ATL!OclFeatureDefinition def : isStatic : String = + self.context_.oclIsUndefined(); + +--- Returns 'true' if self is considered static, 'false' otherwise. +helper context ATL!OclFeature def : isStatic : String = + self.definition.isStatic; + +--- Returns 'true' if self is considered static, 'false' otherwise. +helper context ATL!PropertyCallExp def : isStatic : Boolean = + if self.source.oclIsKindOf(ATL!VariableExp) then + self.source.referredVariable.varName = 'thisModule' + else self.source.oclIsUndefined() endif; + +--- Returns self if it refers to an InPatternElement, or OclUndefined +helper context OclAny def : inPatternElement : ATL!InPatternElement = + OclUndefined; + +--- Returns the InPatternElement that self can use as an InputRuleElement.binding, or OclUndefined +helper context OclAny def : canBindWith : ATL!InPatternElement = + OclUndefined; + +--- Returns the sub-expression of this OclExpression that should be evaluated for the InputRuleElement.binding, or self +helper context OclAny def : bindingSubExp : ATL!OclExpression = + self; + +--- Returns the InputRuleElement for which this OCL expression is part of its binding, or OclUndefined. +helper context OclAny def : partOfBindingFor : ATL!InPatternElement = + OclUndefined; + +--- Returns 'true' if this OCL expression is part of an InputRuleElement binding. +helper context OclAny def : partOfBinding : Boolean = + not self.partOfBindingFor.oclIsUndefined(); + +--- Returns 'true' if this OCL expression contains an InputRuleElement binding. +helper context OclAny def : containsBinding : Boolean = + false; + +--- Returns 'true' if this OCL expression is part of or contains an InputRuleElement binding. +helper context OclAny def : isBinding : Boolean = + self.partOfBinding or self.containsBinding; + +--- Returns the first contained OclExpression that is not an InputRuleElement binding. +helper context ATL!OclExpression def : firstNonBindingExp : ATL!OclExpression = + if self.partOfBinding then + OclUndefined + else + self + endif; + +--- Returns the first contained OclExpression that is not an InputRuleElement binding. +helper context ATL!OperatorCallExp def : firstNonBindingExp : ATL!OclExpression = + if not self.isStatic and self.operationName = 'and' then + if self.source.firstNonBindingExp.oclIsUndefined() then + if self.arguments->first().firstNonBindingExp.oclIsUndefined() then + OclUndefined + else + self.arguments->first() + endif + else + if self.arguments->first().firstNonBindingExp.oclIsUndefined() then + self.source + else + self + endif + endif + else + super.firstNonBindingExp + endif; +
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.emftvm b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.emftvm Binary files differnew file mode 100644 index 00000000..89418b17 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.emftvm diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.atl b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.atl index 59eae753..312b8a3d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.atl +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.atl @@ -2,11 +2,14 @@ -- @nsURI EMFTVM=http://www.eclipse.org/m2m/atl/2011/EMFTVM -- @path ATL=/org.eclipse.m2m.atl.common/model/ATL.ecore -- @path Problem=/org.eclipse.m2m.atl.common/model/Problem.ecore +-- @lib OCLLib=/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.atl -- Transforms ATL modules into EMFTVM modules module OCLtoEMFTVM; create OUT : EMFTVM, PBS : Problem from IN : ATL; +uses OCLLib; + -- ====================================================================== -- helpers begin -- ====================================================================== @@ -79,12 +82,6 @@ helper context ATL!OclFeatureDefinition def : isAttribute : Boolean = helper context ATL!OclFeatureDefinition def : isOperation : Boolean = self.definition.feature.oclIsKindOf(ATL!Operation); -helper context ATL!OclFeatureDefinition def : isStatic : String = - self.context_.oclIsUndefined(); - -helper context ATL!OclFeature def : isStatic : String = - self.definition.isStatic; - helper context ATL!OclFeatureDefinition def : contextType : ATL!"OclType" = self.context_.context_; @@ -120,11 +117,6 @@ helper context OclAny def : parentFeatureDef : ATL!OclFeatureDefinition = else self.debug('Self variable not found in') endif endif; -helper context ATL!PropertyCallExp def : isStatic : Boolean = - if self.source.oclIsKindOf(ATL!VariableExp) then - self.source.referredVariable.varName = 'thisModule' - else self.source.oclIsUndefined() endif; - helper context ATL!OclExpression def : parentIterators : Sequence(ATL!Iterator) = if self.loopExp.oclIsUndefined() then Sequence{} else self.loopExp.iterators endif; @@ -172,30 +164,6 @@ helper context ATL!OclExpression def : isFilterExpression : Boolean = (parent.oclIsKindOf(ATL!InPattern) and parent.filter = self) or parent.isFilterExpression; ---- Returns 'true' if this OCL expression is a rule search plan. -helper context OclAny def : isSearchPlan : Boolean = - false; - ---- Returns 'true' if this OCL expression is a rule search plan. -helper context ATL!OperationCallExp def : isSearchPlan : Boolean = - not self.isStatic and ( - ( - (self.operationName = '=' or self.operationName = 'includes') and - self.arguments->includes(a | - a.oclIsKindOf(ATL!VariableExp) and a.referredVariable.isMatchedRuleField - ) - ) or ( - self.operationName = 'and' and - self.arguments->includes(a | - a.isSearchPlan - ) - ) - ); - ---- Returns 'true' if this OCL expression is part of a rule search plan. -helper context ATL!NavigationOrAttributeCallExp def : isSearchPlanExpression : Boolean = - not self.isStatic and self.refImmediateComposite().isSearchPlanExpression; - -- ====================================================================== -- helpers end -- ====================================================================== @@ -345,7 +313,7 @@ rule IterateResult { -------------- OclExpressions ----------------- abstract rule OclExpression { - from s : ATL!OclExpression in IN + from s : ATL!OclExpression in IN (s.partOfBinding implies s.refImmediateComposite().partOfBinding) to cb : EMFTVM!CodeBlock ( localVariables <- s.parentIterators->union(s.parentAccumulators), lineNumbers <:= Sequence{ln}), @@ -397,14 +365,15 @@ rule SuperNavigationOrAttributeCallExp extends OclExpression { rule OperationCallExp extends OclExpression { from s : ATL!OperationCallExp in IN ( - not s.isStatic and + not s.isStatic and not s.source.oclIsKindOf(ATL!SuperExp) and s.operationName <> 'not' and s.operationName <> 'and' and s.operationName <> 'or' and s.operationName <> 'xor' and s.operationName <> 'implies' and - s.operationName <> 'oclIsUndefined') + s.operationName <> 'oclIsUndefined' and + (not s.partOfBinding or s.canBindWith.oclIsUndefined())) to cb : EMFTVM!CodeBlock ( nested <- s.arguments->prepend(s.source), code <:= Sequence{invokeAllCbs, invoke}), @@ -416,6 +385,34 @@ rule OperationCallExp extends OclExpression { argcount <- s.arguments->size()) } +rule BindingOperationCallExp extends OclExpression { + from s : ATL!OperationCallExp in IN ( + not s.isStatic and + not s.source.oclIsKindOf(ATL!SuperExp) and + s.operationName <> 'not' and + s.operationName <> 'and' and + s.operationName <> 'or' and + s.operationName <> 'xor' and + s.operationName <> 'implies' and + s.operationName <> 'oclIsUndefined' and + s.partOfBinding and + not s.canBindWith.oclIsUndefined()) + using { + inPatternExp : ATL!OclExpression = + if s.source.inPatternElement.oclIsUndefined() then + s.arguments->first() + else + s.source + endif; + } + to cb : EMFTVM!CodeBlock ( + nested <- Sequence{inPatternExp}, + code <:= Sequence{invokeAllCbs}), + ln : EMFTVM!LineNumber ( + instructions <:= Sequence{invokeAllCbs}), + invokeAllCbs : EMFTVM!InvokeAllCbs -- [..., inPatternExp] +} + rule NotOperationCallExp extends OclExpression { from s : ATL!OperationCallExp in IN ( not s.isStatic and s.operationName = 'not') @@ -430,7 +427,7 @@ rule NotOperationCallExp extends OclExpression { rule AndOperationCallExp extends OclExpression { from s : ATL!OperationCallExp in IN ( - not s.isStatic and s.operationName = 'and') + not s.isStatic and s.operationName = 'and' and (s.partOfBinding or s.firstNonBindingExp = s)) to cb : EMFTVM!CodeBlock ( nested <- s.arguments->prepend(s.source), code <:= Sequence{invokeCb, _and}), @@ -440,6 +437,19 @@ rule AndOperationCallExp extends OclExpression { _and : EMFTVM!And (codeBlock <- s.arguments->first()) -- [..., result] } +rule BindingAndOperationCallExp extends OclExpression { + from s : ATL!OperationCallExp in IN ( + not s.isStatic and s.operationName = 'and' and not s.partOfBinding and + not s.firstNonBindingExp.oclIsUndefined() and s.firstNonBindingExp <> s and + not s.refImmediateComposite().oclIsKindOf(ATL!InPattern)) + to cb : EMFTVM!CodeBlock ( + nested <- Sequence{s.firstNonBindingExp}, + code <:= Sequence{invokeCb}), + ln : EMFTVM!LineNumber ( + instructions <:= Sequence{invokeCb}), + invokeCb : EMFTVM!InvokeCb (codeBlock <- s.firstNonBindingExp, argcount <- 0) -- [..., firstNonBindingExp] +} + rule OrOperationCallExp extends OclExpression { from s : ATL!OperationCallExp in IN ( not s.isStatic and s.operationName = 'or') @@ -578,12 +588,24 @@ abstract rule VariableExp extends OclExpression { rule NotSelfVariableExp extends VariableExp { from s : ATL!VariableExp in IN ( - s.referredVariable.varName <> 'self') + s.referredVariable.varName <> 'self' and + not (s.referredVariable.oclIsKindOf(ATL!InPatternElement) and s.partOfBinding)) to cb : EMFTVM!CodeBlock, load : EMFTVM!Load ( localVariable <- s.localVariable()) } +rule InPatternElementBindingVariableExp extends VariableExp { + from s : ATL!VariableExp in IN ( + s.referredVariable.varName <> 'self' and + s.referredVariable.oclIsKindOf(ATL!InPatternElement) and + s.partOfBinding and + s.referredVariable <> s.partOfBindingFor) + to cb : EMFTVM!CodeBlock, + load : EMFTVM!Load ( + localVariable <- thisModule.InPatternElementBindingVariable(s.partOfBindingFor, s.referredVariable)) +} + rule SelfVariableExp extends VariableExp { from s : ATL!VariableExp in IN ( s.referredVariable.varName = 'self') @@ -868,6 +890,15 @@ lazy rule TuplePart { } } +unique lazy rule InPatternElementBindingVariable { + from s : ATL!InPatternElement, + ipe : ATL!InPatternElement + to lv : EMFTVM!LocalVariable ( + name <- ipe.varName, + type <- ipe.type.typeName, + typeModel <- ipe.type.modelName) +} + -- ====================================================================== -- lazy rules end --- ======================================================================
\ No newline at end of file +-- ====================================================================== diff --git a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.emftvm b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.emftvm Binary files differindex c20dc3a8..561bb539 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.emftvm +++ b/plugins/org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.emftvm diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.edit/META-INF/MANIFEST.MF index 55a79433..161367cd 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.edit;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.m2m.atl.emftvm.provider.EmftvmEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/about.html b/plugins/org.eclipse.m2m.atl.emftvm.edit/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/about.html +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.edit/pom.xml index 62bd00f2..b99d32ba 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.edit</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AddItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AddItemProvider.java index b1f3655f..4f238475 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AddItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AddItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstInItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstInItemProvider.java index 6306edde..2d1501a8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstInItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstInItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstItemProvider.java index 19426e68..2db3817c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AndItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AndItemProvider.java index 8cea5d21..39002fb2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AndItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AndItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/BranchInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/BranchInstructionItemProvider.java index d1874c20..3e66a721 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/BranchInstructionItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/BranchInstructionItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockInstructionItemProvider.java index b3e3fe35..23ff1f98 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockInstructionItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockInstructionItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockItemProvider.java index 3348a503..91baa95c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DeleteItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DeleteItemProvider.java index a8ed089f..2d21aa3a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DeleteItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DeleteItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupItemProvider.java index bc64d8b8..73d61f7a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupX1ItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupX1ItemProvider.java index 7203b9da..e8960fd4 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupX1ItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupX1ItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EmftvmEditPlugin.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EmftvmEditPlugin.java index 1a7e7277..cb6f790e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EmftvmEditPlugin.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EmftvmEditPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EmftvmItemProviderAdapterFactory.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EmftvmItemProviderAdapterFactory.java index 2d236b1f..2f64f0de 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EmftvmItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EmftvmItemProviderAdapterFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EnditerateItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EnditerateItemProvider.java index f82d9fb3..11f7030a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EnditerateItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EnditerateItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ExecEnvItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ExecEnvItemProvider.java index 508d8171..df590dbc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ExecEnvItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ExecEnvItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FeatureItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FeatureItemProvider.java index d719da44..176d77e0 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FeatureItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FeatureItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldInstructionItemProvider.java index f7770ab2..0d5278b0 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldInstructionItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldInstructionItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldItemProvider.java index 4e4a6e11..57e79e8e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeItemProvider.java index 9a1fd00a..d7d9caf9 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeSItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeSItemProvider.java index c3b35730..8488179f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeSItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeSItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetItemProvider.java index 1a4eb8d7..b4cb5337 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetStaticItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetStaticItemProvider.java index bec05024..e6f56983 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetStaticItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetStaticItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetTransItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetTransItemProvider.java index 43319aed..8610eee4 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetTransItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetTransItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetcbItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetcbItemProvider.java index 203a229f..5ce763fc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetcbItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetcbItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvItemProvider.java index b4fac079..8e6a00ee 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvtypeItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvtypeItemProvider.java index 2d4791bb..bea3d5de 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvtypeItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvtypeItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GotoItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GotoItemProvider.java index 0520ed17..53c976ca 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GotoItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GotoItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfItemProvider.java index 6b286e94..9e73d604 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfnItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfnItemProvider.java index 92d5bd79..4d7ec3b4 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfnItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfnItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfteItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfteItemProvider.java index aa984c47..7fe7caba 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfteItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfteItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ImpliesItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ImpliesItemProvider.java index b89847d9..cbdb9c35 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ImpliesItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ImpliesItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InputRuleElementItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InputRuleElementItemProvider.java index 2438b596..ffd06fd8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InputRuleElementItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InputRuleElementItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InsertItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InsertItemProvider.java index a71b964b..6cdfea38 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InsertItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InsertItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InstructionItemProvider.java index 822acd14..50e8c451 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InstructionItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InstructionItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeAllCbsItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeAllCbsItemProvider.java index fe270485..76db64f1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeAllCbsItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeAllCbsItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbItemProvider.java index 99d5d65f..2d130ae5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbSItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbSItemProvider.java index a6661e95..d8d4491c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbSItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbSItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeInstructionItemProvider.java index 2b4883cb..be667a46 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeInstructionItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeInstructionItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeItemProvider.java index a3a0a5a1..6c166b5c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeOperationInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeOperationInstructionItemProvider.java index 947da1d8..ea1d3f68 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeOperationInstructionItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeOperationInstructionItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeStaticItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeStaticItemProvider.java index 00c0cdb2..f2338d65 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeStaticItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeStaticItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeSuperItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeSuperItemProvider.java index 6847f870..88a45e81 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeSuperItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeSuperItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IsnullItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IsnullItemProvider.java index 6708fb78..f141b1e9 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IsnullItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IsnullItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IterateItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IterateItemProvider.java index 944e52c7..ad821f1e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IterateItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IterateItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LineNumberItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LineNumberItemProvider.java index 50e50b21..d24ba1f1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LineNumberItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LineNumberItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LoadItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LoadItemProvider.java index 9c34acb0..621f4094 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LoadItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LoadItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableInstructionItemProvider.java index e9f4558d..4b66c751 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableInstructionItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableInstructionItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableItemProvider.java index 71240558..bdda85c0 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchItemProvider.java index 278a0d4d..23a5d2fd 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchSItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchSItemProvider.java index 60191258..3b78d165 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchSItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchSItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MetamodelItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MetamodelItemProvider.java index d7adbce0..92a26c8c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MetamodelItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MetamodelItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModelDeclarationItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModelDeclarationItemProvider.java index 1c250439..6eb395f0 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModelDeclarationItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModelDeclarationItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModelItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModelItemProvider.java index b59d17c7..49facd6c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModelItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModelItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModuleItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModuleItemProvider.java index e7618f45..437c2a1a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModuleItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModuleItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NamedElementItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NamedElementItemProvider.java index 73291c47..8d1245f9 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NamedElementItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NamedElementItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewItemProvider.java index 9062c8f8..55b3838c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewSItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewSItemProvider.java index 8a5be92f..a60bfea1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewSItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewSItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NotItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NotItemProvider.java index 0d033937..d3d1301c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NotItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NotItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OperationItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OperationItemProvider.java index 73f947c3..9383ed94 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OperationItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OperationItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OrItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OrItemProvider.java index 20798e81..6a78f1a1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OrItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OrItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OutputRuleElementItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OutputRuleElementItemProvider.java index 09b597f7..b884145c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OutputRuleElementItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OutputRuleElementItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ParameterItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ParameterItemProvider.java index b9706628..560537a7 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ParameterItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ParameterItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PopItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PopItemProvider.java index 2cb4f92e..d1389e07 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PopItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PopItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushItemProvider.java index 8cde7947..3acbaa7c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushfItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushfItemProvider.java index 9905e9b8..41f2ddcd 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushfItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushfItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushtItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushtItemProvider.java index 5cdebd17..5c5ed053 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushtItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushtItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RemoveItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RemoveItemProvider.java index 3b567631..9edba82b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RemoveItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RemoveItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ReturnItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ReturnItemProvider.java index 4401edbd..88b88094 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ReturnItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ReturnItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleElementItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleElementItemProvider.java index 0eeffaa4..2d1361ab 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleElementItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleElementItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleItemProvider.java index 8049895d..46958d5e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetItemProvider.java index 296ab13f..3a0b2b3f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetStaticItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetStaticItemProvider.java index abcc022d..7b25e778 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetStaticItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetStaticItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/StoreItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/StoreItemProvider.java index b173fc95..45a6035d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/StoreItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/StoreItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapItemProvider.java index 8d18f48f..b3ce861d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapX1ItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapX1ItemProvider.java index e799615f..fe876677 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapX1ItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapX1ItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/TypedElementItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/TypedElementItemProvider.java index 83b96153..69478ee3 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/TypedElementItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/TypedElementItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/XorItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/XorItemProvider.java index 6b0c1f12..85c66a94 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/XorItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/XorItemProvider.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.editor/META-INF/MANIFEST.MF index 64116db5..ea1a597e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.editor;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.m2m.atl.emftvm.presentation.EmftvmEditorPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/about.html b/plugins/org.eclipse.m2m.atl.emftvm.editor/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.editor/about.html +++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.editor/pom.xml index 3e9a8f61..f1a2fb00 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.editor/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.editor</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmActionBarContributor.java b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmActionBarContributor.java index b0ccd532..6cef630d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmActionBarContributor.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmActionBarContributor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditor.java b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditor.java index e1e20365..09ff256c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditor.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditorPlugin.java b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditorPlugin.java index 539fdfb3..85bfd4ee 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditorPlugin.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditorPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmModelWizard.java b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmModelWizard.java index 9541d61c..c85572d6 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmModelWizard.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmModelWizard.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmValidateAction.java b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmValidateAction.java index 8c882c09..5d246e4d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmValidateAction.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmValidateAction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/.project b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/.project new file mode 100644 index 00000000..598dadc7 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.m2m.atl.emftvm.engine-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/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/build.properties b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/build.properties new file mode 100644 index 00000000..1c4a68fd --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/build.properties @@ -0,0 +1,22 @@ +################################################################################ +# Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# Contributors: +# Vrije Universiteit Brussel - initial API and implementation +################################################################################ +bin.includes = modeling32.png,\ + epl-v20.html,\ + feature.properties,\ + feature.xml,\ + license.html,\ + copyright.txt +src.includes = modeling32.png,\ + epl-v20.html,\ + feature.properties,\ + feature.xml,\ + license.html,\ + copyright.txt diff --git a/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/copyright.txt b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/copyright.txt new file mode 100644 index 00000000..b6fd2641 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/copyright.txt @@ -0,0 +1,6 @@ +Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. +Copyright (c) 2012-2021 Dennis Wagelaar. +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License v2.0 +which accompanies this distribution, and is available at +https://www.eclipse.org/legal/epl-2.0/
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/feature.properties b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/feature.properties new file mode 100644 index 00000000..ced65420 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/feature.properties @@ -0,0 +1,180 @@ +################################################################################ +# Copyright (c) 2011-2012 Vrije Universiteit Brussel. +# Copyright (c) 2012-2021 Dennis Wagelaar. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# Contributors: +# Vrije Universiteit Brussel - initial API and implementation +# Dennis Wagelaar +################################################################################ +# "featureName" property - name of the feature +featureName = ATL EMFTVM runtime + +# "providerName" property - name of the company that provides the feature +providerName = Eclipse Modeling Project + +# "description" property - description of the feature +description = ATL EMFTVM runtime engine. + +# "updateSiteName" property - label for the update site +ModelingUpdateSiteName=Eclipse Modeling + +copyrightURL=copyright.txt +copyright=Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel.\n\ +Copyright (c) 2012-2021 Dennis Wagelaar.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ +which accompanies this distribution, and is available at\n\ +https://www.eclipse.org/legal/epl-2.0/ + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +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\ +\n\ +November 22, 2017\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + Installable Software.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ +\n\ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n +########### end of license property ########################################## diff --git a/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/feature.xml b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/feature.xml new file mode 100644 index 00000000..64b7c4d0 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/feature.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.m2m.atl.emftvm.engine" + label="%featureName" + version="4.10.0.qualifier" + provider-name="%providerName"> + + <description> + %description + </description> + + <copyright url="%copyrightURL"> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <url> + <update label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + </url> + + <plugin + id="org.eclipse.m2m.atl.emftvm" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.ant" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.compiler" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.trace" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/license.html b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/license.html new file mode 100644 index 00000000..afb2f35c --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/license.html @@ -0,0 +1,190 @@ + +<?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>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/modeling32.png b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/modeling32.png Binary files differnew file mode 100644 index 00000000..6b08de2a --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/modeling32.png diff --git a/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/pom.xml new file mode 100644 index 00000000..49262258 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.engine-feature/pom.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2012 Obeo. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v2.0 + which accompanies this distribution, and is available at + https://www.eclipse.org/legal/epl-2.0/ + + Contributors: + Obeo - initial creator + --> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>m2m.atl-parent</artifactId> + <groupId>org.eclipse.m2m.atl</groupId> + <version>4.10.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> + </parent> + <groupId>org.eclipse.m2m.atl.features</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.engine</artifactId> + <version>4.10.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> + +</project> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.launcher/META-INF/MANIFEST.MF index b2da8923..0507900c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.launcher;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Activator: org.eclipse.m2m.atl.emftvm.launcher.EmftvmLauncherPlugin Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/about.html b/plugins/org.eclipse.m2m.atl.emftvm.launcher/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/about.html +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.launcher/pom.xml index 5ac519ba..b73d5d7c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.launcher</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMConsoleTracker.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMConsoleTracker.java index 8749613f..324ffb9d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMConsoleTracker.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMConsoleTracker.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConfigurationDelegate.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConfigurationDelegate.java index 370f45e3..546af597 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConfigurationDelegate.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConfigurationDelegate.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -56,8 +57,7 @@ import org.eclipse.m2m.atl.emftvm.util.VMMonitor; * Launches EMFTVM transformation modules. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ -public class EMFTVMLaunchConfigurationDelegate implements - ILaunchConfigurationDelegate { +public class EMFTVMLaunchConfigurationDelegate implements ILaunchConfigurationDelegate { /** * Creates a new {@link EMFTVMLaunchConfigurationDelegate}. @@ -69,6 +69,7 @@ public class EMFTVMLaunchConfigurationDelegate implements /** * {@inheritDoc} */ + @Override public void launch(final ILaunchConfiguration configuration, final String mode, final ILaunch launch, final IProgressMonitor monitor) throws CoreException { ATLConsole.findConsole(); // force ATL console startup @@ -88,20 +89,20 @@ public class EMFTVMLaunchConfigurationDelegate implements try { try { internalLaunch(configuration, mode, launch, monitor); - } catch (CoreException e) { + } catch (final CoreException e) { EmftvmLauncherPlugin.log(e.getStatus()); - } catch (VMException e) { + } catch (final VMException e) { ATLLogger.severe(e.toString()); - } catch (Exception e) { + } catch (final Exception e) { ATLLogger.severe(e.toString()); EmftvmLauncherPlugin.log(e); - } catch (AssertionError e) { + } catch (final AssertionError e) { ATLLogger.severe(e.toString()); EmftvmLauncherPlugin.log(e); } finally { target.terminate(); } - } catch (CoreException e) { + } catch (final CoreException e) { EmftvmLauncherPlugin.log(e.getStatus()); } } @@ -114,7 +115,7 @@ public class EMFTVMLaunchConfigurationDelegate implements launch.addDebugTarget(target); monitor.done(); } - + @SuppressWarnings("unchecked") private void internalLaunch(final ILaunchConfiguration configuration, final String mode, final ILaunch launch, final IProgressMonitor monitor) throws CoreException, IOException { @@ -133,21 +134,21 @@ public class EMFTVMLaunchConfigurationDelegate implements env.setJitDisabled(configuration.getAttribute(EMFTVMLaunchConstants.DISABLE_JIT, false)); env.setMonitor(vmmon); final ResourceSet rs = new ResourceSetImpl(); - + final Map<String, String> metamodelLocations = configuration.getAttribute(EMFTVMLaunchConstants.METAMODELS, Collections.EMPTY_MAP); final Map<String, String> metamodelOptions = configuration.getAttribute(EMFTVMLaunchConstants.METAMODEL_OPTIONS, Collections.EMPTY_MAP); loadFileMetaModels(rs, metamodelLocations, metamodelOptions, env); EMFTVMUtil.registerEPackages(rs); - + final Map<String, String> inputModelLocations = configuration.getAttribute(EMFTVMLaunchConstants.INPUT_MODELS, Collections.EMPTY_MAP); final Map<String, String> inputModelOptions = configuration.getAttribute(EMFTVMLaunchConstants.INPUT_MODEL_OPTIONS, Collections.EMPTY_MAP); loadInputModels(rs, inputModelLocations, inputModelOptions, env); - + final Map<String, String> inoutModelLocations = configuration.getAttribute(EMFTVMLaunchConstants.INOUT_MODELS, Collections.EMPTY_MAP); final Map<String, String> inoutModelOutLocations = configuration.getAttribute(EMFTVMLaunchConstants.INOUT_OUT_MODELS, Collections.EMPTY_MAP); final Map<String, String> inoutModelOptions = configuration.getAttribute(EMFTVMLaunchConstants.INOUT_MODEL_OPTIONS, Collections.EMPTY_MAP); loadInOutModels(rs, inoutModelLocations, inoutModelOptions, env); - + final Map<String, String> outputModelLocations = configuration.getAttribute(EMFTVMLaunchConstants.OUTPUT_MODELS, Collections.EMPTY_MAP); final Map<String, String> outputModelOptions = configuration.getAttribute(EMFTVMLaunchConstants.OUTPUT_MODEL_OPTIONS, Collections.EMPTY_MAP); createOutputModels(rs, outputModelLocations, outputModelOptions, env); @@ -181,7 +182,7 @@ public class EMFTVMLaunchConfigurationDelegate implements final Map<String, String> emptyMap = Collections.emptyMap(); saveModels(env.getOutputModels(), outputModelOptions, emptyMap); } - + /** * Loads all metamodels that have a file or platform URI from <code>modelLocations</code> into <code>env</code>. * @param rs the resource set to use @@ -189,11 +190,11 @@ public class EMFTVMLaunchConfigurationDelegate implements * @param modelOptions map of additional model options * @param env the {@link ExecEnv} to register the metamodels in */ - private void loadFileMetaModels(final ResourceSet rs, final Map<String, String> modelLocations, + private void loadFileMetaModels(final ResourceSet rs, final Map<String, String> modelLocations, final Map<String, String> modelOptions, final ExecEnv env) { - for (Entry<String, String> entry : modelLocations.entrySet()) { - URI uri = URI.createURI((String)entry.getValue()); + for (final Entry<String, String> entry : modelLocations.entrySet()) { + final URI uri = URI.createURI(entry.getValue()); if (uri.isFile() || uri.isPlatform()) { Resource r; if (getBoolOption(modelOptions, entry.getKey(), EMFTVMLaunchConstants.OPT_IS_METAMETAMODEL)) { @@ -201,9 +202,8 @@ public class EMFTVMLaunchConfigurationDelegate implements } else { r = rs.getResource(uri, true); } - Metamodel m = EmftvmFactory.eINSTANCE.createMetamodel(); - m.setResource(r); - env.registerMetaModel((String)entry.getKey(), m); + final Metamodel m = EmftvmFactory.eINSTANCE.createMetamodel(r); + env.registerMetaModel(entry.getKey(), m); } } } @@ -215,11 +215,11 @@ public class EMFTVMLaunchConfigurationDelegate implements * @param modelOptions map of additional model options * @param env the {@link ExecEnv} to register the metamodels in */ - private void loadOtherMetaModels(final ResourceSet rs, final Map<String, String> modelLocations, + private void loadOtherMetaModels(final ResourceSet rs, final Map<String, String> modelLocations, final Map<String, String> modelOptions, final ExecEnv env) { - for (Entry<String, String> entry : modelLocations.entrySet()) { - URI uri = URI.createURI((String)entry.getValue()); + for (final Entry<String, String> entry : modelLocations.entrySet()) { + final URI uri = URI.createURI(entry.getValue()); if (!uri.isFile() && !uri.isPlatform()) { Resource r; if (getBoolOption(modelOptions, entry.getKey(), EMFTVMLaunchConstants.OPT_IS_METAMETAMODEL)) { @@ -227,9 +227,8 @@ public class EMFTVMLaunchConfigurationDelegate implements } else { r = rs.getResource(uri, true); } - Metamodel m = EmftvmFactory.eINSTANCE.createMetamodel(); - m.setResource(r); - env.registerMetaModel((String)entry.getKey(), m); + final Metamodel m = EmftvmFactory.eINSTANCE.createMetamodel(r); + env.registerMetaModel(entry.getKey(), m); } } } @@ -241,26 +240,25 @@ public class EMFTVMLaunchConfigurationDelegate implements * @param modelOptions the map of model options * @return the loaded {@link Model} */ - private Model loadModel(final ResourceSet rs, final Entry<String, String> entry, + private Model loadModel(final ResourceSet rs, final Entry<String, String> entry, final Map<String, String> modelOptions) { final Resource r; if (getBoolOption( - modelOptions, - entry.getKey(), + modelOptions, + entry.getKey(), EMFTVMLaunchConstants.OPT_CREATE_NEW_MODEL)) { r = rs.createResource(URI.createURI(entry.getValue())); } else { r = rs.getResource(URI.createURI(entry.getValue()), true); } - final Model m = EmftvmFactory.eINSTANCE.createModel(); - m.setResource(r); + final Model m = EmftvmFactory.eINSTANCE.createModel(r); m.setAllowInterModelReferences(getBoolOption( - modelOptions, - entry.getKey(), + modelOptions, + entry.getKey(), EMFTVMLaunchConstants.OPT_ALLOW_INTER_MODEL_REFERENCES)); return m; } - + /** * Loads all models from <code>modelLocations</code> into <code>env</code>. * @param rs the resource set to use @@ -271,11 +269,11 @@ public class EMFTVMLaunchConfigurationDelegate implements private void loadInputModels(final ResourceSet rs, final Map<String, String> modelLocations, final Map<String, String> modelOptions, final ExecEnv env) { - for (Entry<String, String> entry : modelLocations.entrySet()) { + for (final Entry<String, String> entry : modelLocations.entrySet()) { env.registerInputModel(entry.getKey(), loadModel(rs, entry, modelOptions)); } } - + /** * Loads all models from <code>modelLocations</code> into <code>env</code>. * @param rs the resource set to use @@ -286,11 +284,11 @@ public class EMFTVMLaunchConfigurationDelegate implements private void loadInOutModels(final ResourceSet rs, final Map<String, String> modelLocations, final Map<String, String> modelOptions, final ExecEnv env) { - for (Entry<String, String> entry : modelLocations.entrySet()) { + for (final Entry<String, String> entry : modelLocations.entrySet()) { env.registerInOutModel(entry.getKey(), loadModel(rs, entry, modelOptions)); } } - + /** * Creates new models for all models from <code>modelLocations</code> in <code>env</code>. * @param rs the resource set to use @@ -298,16 +296,15 @@ public class EMFTVMLaunchConfigurationDelegate implements * @param modelOptions map of additional model options * @param env the {@link ExecEnv} to register the models in */ - private void createOutputModels(final ResourceSet rs, final Map<String, String> modelLocations, + private void createOutputModels(final ResourceSet rs, final Map<String, String> modelLocations, final Map<String, String> modelOptions, final ExecEnv env) { - for (Entry<String, String> entry : modelLocations.entrySet()) { - Resource r = rs.createResource(URI.createURI(entry.getValue())); - Model m = EmftvmFactory.eINSTANCE.createModel(); - m.setResource(r); + for (final Entry<String, String> entry : modelLocations.entrySet()) { + final Resource r = rs.createResource(URI.createURI(entry.getValue())); + final Model m = EmftvmFactory.eINSTANCE.createModel(r); m.setAllowInterModelReferences(getBoolOption( - modelOptions, - entry.getKey(), + modelOptions, + entry.getKey(), EMFTVMLaunchConstants.OPT_ALLOW_INTER_MODEL_REFERENCES)); env.registerOutputModel(entry.getKey(), m); } @@ -318,26 +315,26 @@ public class EMFTVMLaunchConfigurationDelegate implements * @param models * @param modelOptions map of additional model options * @param modelLocations map of alternative model output locations - * @throws IOException - * @throws CoreException + * @throws IOException + * @throws CoreException */ @SuppressWarnings("deprecation") - private void saveModels(final Map<String, Model> models, + private void saveModels(final Map<String, Model> models, final Map<String, String> modelOptions, final Map<String, String> modelLocations) throws IOException, CoreException { final IWorkspaceRoot wr = ResourcesPlugin.getWorkspace().getRoot(); - for (Entry<String, Model> model : models.entrySet()) { + for (final Entry<String, Model> model : models.entrySet()) { if (modelLocations.containsKey(model.getKey())) { model.getValue().getResource().setURI(URI.createURI(modelLocations.get(model.getKey()))); } model.getValue().getResource().save(Collections.emptyMap()); - URI uri = model.getValue().getResource().getURI(); + final URI uri = model.getValue().getResource().getURI(); if (uri.isPlatformResource()) { - IResource r = wr.findMember(uri.toPlatformString(true)); + final IResource r = wr.findMember(uri.toPlatformString(true)); if (r instanceof IFile && getBoolOption( - modelOptions, - model.getKey(), - EMFTVMLaunchConstants.OPT_DERIVED_FILE)) { + modelOptions, + model.getKey(), + EMFTVMLaunchConstants.OPT_DERIVED_FILE)) { ((IFile)r).setDerived(true); } } @@ -375,7 +372,7 @@ public class EMFTVMLaunchConfigurationDelegate implements modelOptions.put(modelName, (options + ' ' + option).trim()); } } - + /** * Unsets the boolean value of <code>option</code> for <code>modelName</code> from <code>modelOptions</code>. * @param modelOptions the model options map @@ -396,7 +393,7 @@ public class EMFTVMLaunchConfigurationDelegate implements * @return the {@link NetworkDebugger} port. * @throws CoreException */ - public static int getPort(ILaunch launch) throws CoreException { + public static int getPort(final ILaunch launch) throws CoreException { String portOption = ""; //$NON-NLS-1$ if (launch != null) { portOption = launch.getLaunchConfiguration().getAttribute(ATLLaunchConstants.PORT, @@ -419,5 +416,5 @@ public class EMFTVMLaunchConfigurationDelegate implements } return resolver; } - + } diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConfigurationTabGroup.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConfigurationTabGroup.java index 4d99513f..b9471c6d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConfigurationTabGroup.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConfigurationTabGroup.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2014 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConstants.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConstants.java index 534881e8..1a4f916b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConstants.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMLaunchConstants.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2014 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMParameterTab.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMParameterTab.java index c15bdebd..930bfdf1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMParameterTab.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EMFTVMParameterTab.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004-2014 INRIA and Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Mikael Barbero (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EmftvmLauncherImages.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EmftvmLauncherImages.java index 2255a23a..6e5bcb4f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EmftvmLauncherImages.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EmftvmLauncherImages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EmftvmLauncherPlugin.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EmftvmLauncherPlugin.java index d1bb9080..426047e3 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EmftvmLauncherPlugin.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/EmftvmLauncherPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/LaunchAdapter.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/LaunchAdapter.java index ea3db5db..46d99688 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/LaunchAdapter.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/LaunchAdapter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/MainEMFTVMTab.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/MainEMFTVMTab.java index 7a3bf0ed..0861ea56 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/MainEMFTVMTab.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/MainEMFTVMTab.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Mikael Barbero (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/compat/EMFTVMUILauncher.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/compat/EMFTVMUILauncher.java index d837cabf..6a0f2e51 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/compat/EMFTVMUILauncher.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/compat/EMFTVMUILauncher.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2017 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/ADWPDebuggee.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/ADWPDebuggee.java index d03fe46d..4508fed8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/ADWPDebuggee.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/ADWPDebuggee.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 INRIA. * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/LocalObjectReference.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/LocalObjectReference.java index fb0396d3..c3c693a3 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/LocalObjectReference.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/LocalObjectReference.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 INRIA. * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/NetworkDebugger.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/NetworkDebugger.java index 95ac9b0d..0e80e6ed 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/NetworkDebugger.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/debug/NetworkDebugger.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 INRIA. * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/profiler/ProfilingLaunchAdapter.java b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/profiler/ProfilingLaunchAdapter.java index 445d124f..b11598b6 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/profiler/ProfilingLaunchAdapter.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/src/org/eclipse/m2m/atl/emftvm/launcher/profiler/ProfilingLaunchAdapter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2014 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..a046ef04 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,15 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/META-INF/MANIFEST.MF index cd0356a7..688059ed 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.trace.edit;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.m2m.atl.emftvm.trace.provider.TraceEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/about.html b/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/about.html +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/pom.xml index bcad378d..34f73c92 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace.edit/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.trace.edit</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..a046ef04 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,15 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/META-INF/MANIFEST.MF index d6876389..886b6c59 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.trace.editor;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.m2m.atl.emftvm.trace.presentation.TraceEditorPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/about.html b/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/about.html +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/pom.xml index 7adaede4..35d52400 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace.editor/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.trace.editor</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.trace/META-INF/MANIFEST.MF index cff450b1..9adb317a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.trace;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/about.html b/plugins/org.eclipse.m2m.atl.emftvm.trace/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/about.html +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.trace/deploy/release/pom.xml index ddcd2c10..b5d1a93e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.trace</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.trace/deploy/snapshot/pom.xml index f548648b..495b855f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.trace</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.trace/pom.xml index 1c0cc356..a6103160 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.trace</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/SourceElement.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/SourceElement.java index 312e3ac3..a1207356 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/SourceElement.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/SourceElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/SourceElementList.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/SourceElementList.java index 678b7dd8..38550dc1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/SourceElementList.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/SourceElementList.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TargetElement.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TargetElement.java index a6d7d829..55b8c391 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TargetElement.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TargetElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceElement.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceElement.java index ce516400..57a56a44 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceElement.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceFactory.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceFactory.java index b046aa51..d9782293 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceFactory.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceLink.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceLink.java index a8c5607a..53a35d44 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceLink.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceLink.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceLinkSet.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceLinkSet.java index 6ee7a1bb..6041d1f5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceLinkSet.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TraceLinkSet.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TracePackage.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TracePackage.java index 3240bfd8..25465b36 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TracePackage.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TracePackage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TracedRule.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TracedRule.java index 1fb77eae..ef8547b2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TracedRule.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/TracedRule.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/SourceElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/SourceElementImpl.java index 1b732a28..76fd0552 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/SourceElementImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/SourceElementImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/SourceElementListImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/SourceElementListImpl.java index 31c0d2d5..328cc548 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/SourceElementListImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/SourceElementListImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TargetElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TargetElementImpl.java index a7cd87f3..49503417 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TargetElementImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TargetElementImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceElementImpl.java index d779febc..3701e391 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceElementImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceElementImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceFactoryImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceFactoryImpl.java index f79849f9..26a6171d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceFactoryImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceFactoryImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceLinkImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceLinkImpl.java index 4b14ae5c..771c124e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceLinkImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceLinkImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceLinkSetImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceLinkSetImpl.java index 4f815445..6729aff1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceLinkSetImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TraceLinkSetImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TracePackageImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TracePackageImpl.java index a7006ad7..967d1ebc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TracePackageImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TracePackageImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TracedRuleImpl.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TracedRuleImpl.java index eae06644..39d7e865 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TracedRuleImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/impl/TracedRuleImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/util/TraceAdapterFactory.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/util/TraceAdapterFactory.java index c9cdc345..9ffc2fc9 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/util/TraceAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/util/TraceAdapterFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/util/TraceSwitch.java b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/util/TraceSwitch.java index 810ed575..b1227347 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/util/TraceSwitch.java +++ b/plugins/org.eclipse.m2m.atl.emftvm.trace/src/org/eclipse/m2m/atl/emftvm/trace/util/TraceSwitch.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/.project b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/.project new file mode 100644 index 00000000..fe544772 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.m2m.atl.emftvm.ui-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/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/build.properties b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/build.properties new file mode 100644 index 00000000..1c4a68fd --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/build.properties @@ -0,0 +1,22 @@ +################################################################################ +# Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# Contributors: +# Vrije Universiteit Brussel - initial API and implementation +################################################################################ +bin.includes = modeling32.png,\ + epl-v20.html,\ + feature.properties,\ + feature.xml,\ + license.html,\ + copyright.txt +src.includes = modeling32.png,\ + epl-v20.html,\ + feature.properties,\ + feature.xml,\ + license.html,\ + copyright.txt diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/copyright.txt b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/copyright.txt new file mode 100644 index 00000000..b6fd2641 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/copyright.txt @@ -0,0 +1,6 @@ +Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. +Copyright (c) 2012-2021 Dennis Wagelaar. +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License v2.0 +which accompanies this distribution, and is available at +https://www.eclipse.org/legal/epl-2.0/
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/feature.properties b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/feature.properties new file mode 100644 index 00000000..127ea3c3 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/feature.properties @@ -0,0 +1,180 @@ +################################################################################ +# Copyright (c) 2011-2012 Vrije Universiteit Brussel. +# Copyright (c) 2012-2021 Dennis Wagelaar. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# Contributors: +# Vrije Universiteit Brussel - initial API and implementation +# Dennis Wagelaar +################################################################################ +# "featureName" property - name of the feature +featureName = ATL EMFTVM UI + +# "providerName" property - name of the company that provides the feature +providerName = Eclipse Modeling Project + +# "description" property - description of the feature +description = ATL EMFTVM graphical user interface. + +# "updateSiteName" property - label for the update site +ModelingUpdateSiteName=Eclipse Modeling + +copyrightURL=copyright.txt +copyright=Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel.\n\ +Copyright (c) 2012-2021 Dennis Wagelaar.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ +which accompanies this distribution, and is available at\n\ +https://www.eclipse.org/legal/epl-2.0/ + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +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\ +\n\ +November 22, 2017\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + Installable Software.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ +\n\ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n +########### end of license property ########################################## diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/feature.xml b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/feature.xml new file mode 100644 index 00000000..239b3bb2 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/feature.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.m2m.atl.emftvm.ui" + label="%featureName" + version="4.10.0.qualifier" + provider-name="%providerName"> + + <description> + %description + </description> + + <copyright url="%copyrightURL"> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <url> + <update label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + </url> + + <plugin + id="org.eclipse.m2m.atl.emftvm.edit" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.editor" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.launcher" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.trace.edit" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.trace.editor" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/license.html b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/license.html new file mode 100644 index 00000000..afb2f35c --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/license.html @@ -0,0 +1,190 @@ + +<?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>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/modeling32.png b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/modeling32.png Binary files differnew file mode 100644 index 00000000..6b08de2a --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/modeling32.png diff --git a/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/pom.xml new file mode 100644 index 00000000..ba424398 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm.ui-feature/pom.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2012 Obeo. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v2.0 + which accompanies this distribution, and is available at + https://www.eclipse.org/legal/epl-2.0/ + + Contributors: + Obeo - initial creator + --> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>m2m.atl-parent</artifactId> + <groupId>org.eclipse.m2m.atl</groupId> + <version>4.10.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> + </parent> + <groupId>org.eclipse.m2m.atl.features</groupId> + <artifactId>org.eclipse.m2m.atl.emftvm.ui</artifactId> + <version>4.10.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> + +</project> diff --git a/plugins/org.eclipse.m2m.atl.emftvm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.m2m.atl.emftvm/.settings/org.eclipse.jdt.core.prefs index af0f20f9..9268d637 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.m2m.atl.emftvm/.settings/org.eclipse.jdt.core.prefs @@ -3,5 +3,8 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.5 diff --git a/plugins/org.eclipse.m2m.atl.emftvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm/META-INF/MANIFEST.MF index 509714ae..3cf5aa39 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.emftvm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.m2m.atl.common, org.eclipse.core.resources, org.eclipse.emf.validation;bundle-version="1.4.0", - org.objectweb.asm;bundle-version="[5.0.1,8.0.0)", + org.objectweb.asm;bundle-version="[5.0.1,10.0.0)", org.eclipse.m2m.atl.core.emf;visibility:=reexport Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.m2m.atl.emftvm diff --git a/plugins/org.eclipse.m2m.atl.emftvm/about.html b/plugins/org.eclipse.m2m.atl.emftvm/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/about.html +++ b/plugins/org.eclipse.m2m.atl.emftvm/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.emftvm/about.properties b/plugins/org.eclipse.m2m.atl.emftvm/about.properties index eff498bf..00683675 100755 --- a/plugins/org.eclipse.m2m.atl.emftvm/about.properties +++ b/plugins/org.eclipse.m2m.atl.emftvm/about.properties @@ -3,7 +3,8 @@ appName=EMF Transformation Virtual Machine aboutText=EMF Transformation Virtual Machine Plug-in\n\ Version: {featureVersion}\n\ \n\ -(c) Copyright 2011-2014 Dennis Wagelaar, Vrije Universiteit Brussel.\n\ +(c) Copyright 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel.\n\ +(c) Copyright 2012-2021 Dennis Wagelaar.\n\ \n\ The ATL EMF Transformation Virtual Machine (EMFTVM) provides a new, low-level\n\ model manipulation bytecode language that is based on an Ecore metamodel, as well as\n\ diff --git a/plugins/org.eclipse.m2m.atl.emftvm/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm/deploy/release/pom.xml index a63696ea..c031115a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> @@ -33,7 +33,7 @@ <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> - <version>[5.0.1,6.0)</version> + <version>[5.0.1,9.0)</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm/deploy/snapshot/pom.xml index d0cc3467..7cf4784f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> @@ -33,7 +33,7 @@ <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> - <version>[5.0.1,6.0)</version> + <version>[5.0.1,9.0)</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.emftvm/doc/EMFTVM.xls b/plugins/org.eclipse.m2m.atl.emftvm/doc/EMFTVM.xls Binary files differindex 30b9a057..3e782a70 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/doc/EMFTVM.xls +++ b/plugins/org.eclipse.m2m.atl.emftvm/doc/EMFTVM.xls diff --git a/plugins/org.eclipse.m2m.atl.emftvm/plugin.xml b/plugins/org.eclipse.m2m.atl.emftvm/plugin.xml index f7ac3259..5e692430 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/plugin.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm/plugin.xml @@ -3,11 +3,11 @@ <!-- (C) 2011, Vrije Universiteit Brussel - - $Id: plugin.xml,v 1.3 2012/01/02 11:49:41 dwagelaar Exp $ + (C) 2021, Dennis Wagelaar --> <plugin> + <extension-point id="modelfactory" name="ATL/EMFTVM Model Factory" schema="schema/modelfactory.exsd"/> <extension point="org.eclipse.emf.ecore.generated_package"> <package @@ -103,5 +103,12 @@ context="org.eclipse.m2m.atl.emftvm.clientContext"> </binding> </extension> + <extension + id="default" + point="org.eclipse.m2m.atl.emftvm.modelfactory"> + <modelfactory + class="org.eclipse.m2m.atl.emftvm.impl.ModelFactoryImpl"> + </modelfactory> + </extension> </plugin> diff --git a/plugins/org.eclipse.m2m.atl.emftvm/pom.xml b/plugins/org.eclipse.m2m.atl.emftvm/pom.xml index b25ac146..1e32b11b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/pom.xml +++ b/plugins/org.eclipse.m2m.atl.emftvm/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.emftvm/schema/modelfactory.exsd b/plugins/org.eclipse.m2m.atl.emftvm/schema/modelfactory.exsd new file mode 100644 index 00000000..7eb28a06 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm/schema/modelfactory.exsd @@ -0,0 +1,96 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Schema file written by PDE --> +<schema targetNamespace="org.eclipse.m2m.atl.emftvm" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appInfo> + <meta.schema plugin="org.eclipse.m2m.atl.emftvm" id="modelfactory" name="ATL/EMFTVM Model Factory"/> + </appInfo> + <documentation> + ATL/EMFTVM Custom Model Factory extension point. + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> + <complexType> + <sequence minOccurs="1" maxOccurs="unbounded"> + <element ref="modelfactory"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="modelfactory"> + <complexType> + <attribute name="class" type="string" use="required"> + <annotation> + <documentation> + The ModelFactory class supplied by the extension. + </documentation> + <appInfo> + <meta.attribute kind="java" basedOn=":org.eclipse.m2m.atl.emftvm.ModelFactory"/> + </appInfo> + </annotation> + </attribute> + <attribute name="resourceType" type="string"> + <annotation> + <documentation> + The EMF Resource interface/class supported by the provided ModelFactory. + </documentation> + <appInfo> + <meta.attribute kind="java" basedOn=":org.eclipse.emf.ecore.resource.Resource"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + 4.4.0 + </documentation> + </annotation> + + + + + <annotation> + <appInfo> + <meta.section type="copyright"/> + </appInfo> + <documentation> + (C) 2021, Dennis Wagelaar + </documentation> + </annotation> + +</schema> diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Add.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Add.java index 848dad61..61767aaa 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Add.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Add.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Allinst.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Allinst.java index e88765f0..775bb6f2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Allinst.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Allinst.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/AllinstIn.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/AllinstIn.java index 2bfd7db0..96bfdaa6 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/AllinstIn.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/AllinstIn.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/And.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/And.java index ffe2942b..6576a460 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/And.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/And.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/BranchInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/BranchInstruction.java index 98683969..b3304619 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/BranchInstruction.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/BranchInstruction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlock.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlock.java index d1acd5ad..91cf3266 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlock.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlock.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlockInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlockInstruction.java index 01717fff..50910940 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlockInstruction.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlockInstruction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ConstantTag.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ConstantTag.java index 8be3daea..10b5e122 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ConstantTag.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ConstantTag.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Delete.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Delete.java index 0cdb4b6a..e6f1cbff 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Delete.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Delete.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Dup.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Dup.java index ae009f64..82328f56 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Dup.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Dup.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/DupX1.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/DupX1.java index 7af9b757..c2e7404a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/DupX1.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/DupX1.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/EmftvmFactory.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/EmftvmFactory.java index 6752d168..089ded91 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/EmftvmFactory.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/EmftvmFactory.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -12,6 +13,7 @@ package org.eclipse.m2m.atl.emftvm; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.emf.ecore.resource.Resource; /** * <!-- begin-user-doc --> @@ -623,4 +625,22 @@ public interface EmftvmFactory extends EFactory { */ Instruction createInstruction(Opcode opcode); + /** + * Creates a new {@link Model} for the given {@link Resource}, and sets the + * {@link Resource}. + * + * @param resource the {@link Resource} to wrap + * @return a new {@link Model} + */ + Model createModel(Resource resource); + + /** + * Creates a new {@link Metamodel} for the given {@link Resource}, and sets the + * {@link Resource}. + * + * @param resource the {@link Resource} to wrap + * @return a new {@link Metamodel} + */ + Metamodel createMetamodel(Resource resource); + } //EmftvmFactory diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/EmftvmPackage.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/EmftvmPackage.java index 09a9b318..2ec28c42 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/EmftvmPackage.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/EmftvmPackage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Enditerate.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Enditerate.java index c38b98e0..8379a5d8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Enditerate.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Enditerate.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ExecEnv.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ExecEnv.java index d8979042..26dc24c9 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ExecEnv.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ExecEnv.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Feature.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Feature.java index 957a9e47..09c2968d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Feature.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Feature.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FeatureTag.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FeatureTag.java index 3617923b..029d47c4 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FeatureTag.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FeatureTag.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Field.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Field.java index 09e0f3bf..f878dd9d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Field.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Field.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FieldInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FieldInstruction.java index 4539b524..23b5cc5f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FieldInstruction.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FieldInstruction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Findtype.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Findtype.java index b1bb8d32..f83950c1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Findtype.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Findtype.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FindtypeS.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FindtypeS.java index 1b361d81..06b2631c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FindtypeS.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FindtypeS.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Get.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Get.java index 881c325e..16a8293f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Get.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Get.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/GetStatic.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/GetStatic.java index 690b467c..fe0a1a03 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/GetStatic.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/GetStatic.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/GetTrans.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/GetTrans.java index 819b6f1e..4aacd2b4 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/GetTrans.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/GetTrans.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getcb.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getcb.java index 5e023c98..785d42b8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getcb.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getcb.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getenv.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getenv.java index 0ccc684e..d21f618f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getenv.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getenv.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getenvtype.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getenvtype.java index 937ce53c..fdcf0477 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getenvtype.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Getenvtype.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Goto.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Goto.java index 3e02bb8d..2db8933c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Goto.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Goto.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/If.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/If.java index c3716caa..4d8907a4 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/If.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/If.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifn.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifn.java index 620498fa..02945100 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifn.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifn.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifte.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifte.java index 75711d62..ddb53811 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifte.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifte.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Implies.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Implies.java index 4be5f09d..6e78baea 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Implies.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Implies.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InputRuleElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InputRuleElement.java index c5c880cd..1e9b66b2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InputRuleElement.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InputRuleElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Insert.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Insert.java index 36f1650c..1fb59fff 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Insert.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Insert.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Instruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Instruction.java index f8890e10..567b9788 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Instruction.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Instruction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Invoke.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Invoke.java index 0b4088ed..8ec191b6 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Invoke.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Invoke.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeAllCbs.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeAllCbs.java index 05dfcb04..73243c8d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeAllCbs.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeAllCbs.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeCb.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeCb.java index 423f5094..776e2b0f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeCb.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeCb.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeCbS.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeCbS.java index b314b77a..92d400d7 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeCbS.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeCbS.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeInstruction.java index d4c1c553..e8284106 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeInstruction.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeInstruction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeOperationInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeOperationInstruction.java index d50ee27b..d9f06ddb 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeOperationInstruction.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeOperationInstruction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeStatic.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeStatic.java index ea55437a..611d0025 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeStatic.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeStatic.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeSuper.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeSuper.java index 52cfeed2..f4c9a23c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeSuper.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeSuper.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Isnull.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Isnull.java index e0207f0a..4e5b76ff 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Isnull.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Isnull.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Iterate.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Iterate.java index 45e20101..e184e14b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Iterate.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Iterate.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LineNumber.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LineNumber.java index ad36a71e..2af3b0af 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LineNumber.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LineNumber.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Load.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Load.java index 9ee63a5f..7abd3e0c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Load.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Load.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariable.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariable.java index 710fa7df..4aad6f4c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariable.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariable.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariableInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariableInstruction.java index c1d79d24..097b1f4b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariableInstruction.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariableInstruction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Match.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Match.java index 3c55c3e8..e13b9652 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Match.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Match.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/MatchS.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/MatchS.java index b03928fe..2cf24c5e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/MatchS.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/MatchS.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Messages.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Messages.java index 3143042f..ec27a8dc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Messages.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2017 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Metamodel.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Metamodel.java index 9e1ac838..b8245cd9 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Metamodel.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Metamodel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Model.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Model.java index f9d406f8..94b7cc28 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Model.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Model.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclaration.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclaration.java index 434a82b1..3859598d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclaration.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclaration.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclarationTag.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclarationTag.java index 724cdd2e..0cd273d5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclarationTag.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclarationTag.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelFactory.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelFactory.java new file mode 100644 index 00000000..579239d6 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelFactory.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm; + +import org.eclipse.emf.ecore.resource.Resource; + +/** + * Interface for {@link Resource}-specific {@link Model} factory objects. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public interface ModelFactory { + + /** + * Creates a new {@link Model} for the given {@link Resource}. + * + * @param resource the {@link Resource} to wrap + * @return a new {@link Model} + */ + Model createModel(Resource resource); + + /** + * Creates a new {@link Metamodel} for the given {@link Resource}. + * + * @param resource the {@link Resource} to wrap + * @return a new {@link Metamodel} + */ + Metamodel createMetamodel(Resource resource); + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Module.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Module.java index 1cdf5295..d5efd715 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Module.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Module.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NamedElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NamedElement.java index d3294e22..9006f48b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NamedElement.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NamedElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/New.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/New.java index e8cd1a18..9ad06267 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/New.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/New.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NewS.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NewS.java index 60636e24..ca4a7a71 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NewS.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NewS.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Not.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Not.java index c0d74885..86abe774 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Not.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Not.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Opcode.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Opcode.java index c99735b1..d03099b8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Opcode.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Opcode.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Operation.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Operation.java index 7f61c200..4eaf2c36 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Operation.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Operation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Or.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Or.java index 12631c41..609d1e04 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Or.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Or.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/OutputRuleElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/OutputRuleElement.java index 4dbbe350..aea4e45c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/OutputRuleElement.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/OutputRuleElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Parameter.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Parameter.java index fde564aa..98265e18 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Parameter.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Parameter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pop.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pop.java index 2398ce2e..dfc46429 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pop.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pop.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Push.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Push.java index 56d7c09d..74553b0a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Push.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Push.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pushf.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pushf.java index df95e4af..8a0723f8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pushf.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pushf.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pusht.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pusht.java index 2e3f6535..578f2798 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pusht.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Pusht.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Remove.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Remove.java index bd2a968b..56f4d70a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Remove.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Remove.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Return.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Return.java index 03ce27cf..08263be4 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Return.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Return.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Rule.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Rule.java index a5f29c22..6a888a6a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Rule.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Rule.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleElement.java index cd9cb7af..e35d7660 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleElement.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleMode.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleMode.java index d71b81ac..590e3be5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleMode.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleMode.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Set.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Set.java index b0972262..77b9fc83 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Set.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Set.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/SetStatic.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/SetStatic.java index 73b69101..0122d3b3 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/SetStatic.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/SetStatic.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Store.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Store.java index 7184ead9..f4d6c966 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Store.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Store.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Swap.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Swap.java index bb54cf5d..36b6a25f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Swap.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Swap.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/SwapX1.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/SwapX1.java index 8c5090fb..d9fc682c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/SwapX1.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/SwapX1.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/TypedElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/TypedElement.java index 4e3ef171..d33ee8b3 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/TypedElement.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/TypedElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Xor.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Xor.java index 88de78d4..33ff44d2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Xor.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Xor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/StackUnderflowConstraint.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/StackUnderflowConstraint.java index 4398f3a0..cbcbe7c8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/StackUnderflowConstraint.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/StackUnderflowConstraint.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/StackUnderflowValidator.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/StackUnderflowValidator.java index a103b53a..93f52977 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/StackUnderflowValidator.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/StackUnderflowValidator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012-2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/ValidCodeBlockStackLevelConstraint.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/ValidCodeBlockStackLevelConstraint.java index 00cad340..68699d4b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/ValidCodeBlockStackLevelConstraint.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/ValidCodeBlockStackLevelConstraint.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2013 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/ValidCodeBlockStackLevelValidator.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/ValidCodeBlockStackLevelValidator.java index ff4fef42..3937c0bd 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/ValidCodeBlockStackLevelValidator.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/ValidCodeBlockStackLevelValidator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/Validator.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/Validator.java index 25f865ba..804e1ce2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/Validator.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/constraints/Validator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AddImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AddImpl.java index 86f508b0..d2ed1f9d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AddImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AddImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstImpl.java index 9b7089fe..0dad10f5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstInImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstInImpl.java index e525a4e0..6b27b312 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstInImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstInImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AndImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AndImpl.java index 7acb7430..d107d3ba 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AndImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AndImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/BranchInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/BranchInstructionImpl.java index aa17c623..666819ae 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/BranchInstructionImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/BranchInstructionImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockImpl.java index c6e2cb89..e728b871 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockInstructionImpl.java index 7d0d6da4..0bfcb981 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockInstructionImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockInstructionImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DeleteImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DeleteImpl.java index 4f563452..dc2c6f42 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DeleteImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DeleteImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupImpl.java index deb74ce6..5c31a9c5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupX1Impl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupX1Impl.java index 5966763c..6299bae2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupX1Impl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupX1Impl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmFactoryImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmFactoryImpl.java index 1d4bee6d..f802beca 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmFactoryImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmFactoryImpl.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -13,6 +14,7 @@ package org.eclipse.m2m.atl.emftvm.impl; import java.lang.reflect.Method; +import java.util.logging.Level; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -20,6 +22,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.m2m.atl.common.ATLLogger; import org.eclipse.m2m.atl.emftvm.Add; import org.eclipse.m2m.atl.emftvm.Allinst; import org.eclipse.m2m.atl.emftvm.AllinstIn; @@ -69,6 +73,7 @@ import org.eclipse.m2m.atl.emftvm.Metamodel; import org.eclipse.m2m.atl.emftvm.Model; import org.eclipse.m2m.atl.emftvm.ModelDeclaration; import org.eclipse.m2m.atl.emftvm.ModelDeclarationTag; +import org.eclipse.m2m.atl.emftvm.ModelFactory; import org.eclipse.m2m.atl.emftvm.Module; import org.eclipse.m2m.atl.emftvm.New; import org.eclipse.m2m.atl.emftvm.NewS; @@ -99,8 +104,11 @@ import org.eclipse.m2m.atl.emftvm.util.LazyList; import org.eclipse.m2m.atl.emftvm.util.LazyOrderedSet; import org.eclipse.m2m.atl.emftvm.util.LazySet; import org.eclipse.m2m.atl.emftvm.util.ModuleResolver; +import org.eclipse.m2m.atl.emftvm.util.PluginExtensionUtil; import org.eclipse.m2m.atl.emftvm.util.StackFrame; import org.eclipse.m2m.atl.emftvm.util.TimingData; +import org.eclipse.m2m.atl.emftvm.util.TypeHashMap; +import org.eclipse.m2m.atl.emftvm.util.TypeMap; /** * <!-- begin-user-doc --> @@ -110,6 +118,16 @@ import org.eclipse.m2m.atl.emftvm.util.TimingData; * @generated */ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { + + /** + * Implementation class name for {@link PluginExtensionUtil}. + */ + private static final String PLUGIN_EXTENSION_UTIL_IMPL = "org.eclipse.m2m.atl.emftvm.util.PluginExtensionUtilImpl"; + + protected final ModelFactory defaultModelFactory = new ModelFactoryImpl(); + + private TypeMap<Class<?>, ModelFactory> modelFactoryRegistry; + /** * Creates an instance of the factory. * <!-- begin-user-doc --> @@ -129,12 +147,12 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { */ public static EmftvmFactory init() { try { - EmftvmFactory theEmftvmFactory = (EmftvmFactory)EPackage.Registry.INSTANCE.getEFactory(EmftvmPackage.eNS_URI); + final EmftvmFactory theEmftvmFactory = (EmftvmFactory)EPackage.Registry.INSTANCE.getEFactory(EmftvmPackage.eNS_URI); if (theEmftvmFactory != null) { return theEmftvmFactory; } } - catch (Exception exception) { + catch (final Exception exception) { EcorePlugin.INSTANCE.log(exception); } return new EmftvmFactoryImpl(); @@ -147,74 +165,74 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ @Override - public EObject create(EClass eClass) { + public EObject create(final EClass eClass) { switch (eClass.getClassifierID()) { - case EmftvmPackage.EXEC_ENV: return createExecEnv(); - case EmftvmPackage.MODEL: return createModel(); - case EmftvmPackage.METAMODEL: return createMetamodel(); - case EmftvmPackage.MODULE: return createModule(); - case EmftvmPackage.MODEL_DECLARATION: return createModelDeclaration(); - case EmftvmPackage.FIELD: return createField(); - case EmftvmPackage.OPERATION: return createOperation(); - case EmftvmPackage.PARAMETER: return createParameter(); - case EmftvmPackage.LINE_NUMBER: return createLineNumber(); - case EmftvmPackage.LOCAL_VARIABLE: return createLocalVariable(); - case EmftvmPackage.RULE: return createRule(); - case EmftvmPackage.INPUT_RULE_ELEMENT: return createInputRuleElement(); - case EmftvmPackage.OUTPUT_RULE_ELEMENT: return createOutputRuleElement(); - case EmftvmPackage.CODE_BLOCK: return createCodeBlock(); - case EmftvmPackage.PUSH: return createPush(); - case EmftvmPackage.PUSHT: return createPusht(); - case EmftvmPackage.PUSHF: return createPushf(); - case EmftvmPackage.POP: return createPop(); - case EmftvmPackage.LOAD: return createLoad(); - case EmftvmPackage.STORE: return createStore(); - case EmftvmPackage.SET: return createSet(); - case EmftvmPackage.GET: return createGet(); - case EmftvmPackage.GET_TRANS: return createGetTrans(); - case EmftvmPackage.SET_STATIC: return createSetStatic(); - case EmftvmPackage.GET_STATIC: return createGetStatic(); - case EmftvmPackage.FINDTYPE: return createFindtype(); - case EmftvmPackage.FINDTYPE_S: return createFindtypeS(); - case EmftvmPackage.NEW: return createNew(); - case EmftvmPackage.NEW_S: return createNewS(); - case EmftvmPackage.DELETE: return createDelete(); - case EmftvmPackage.DUP: return createDup(); - case EmftvmPackage.DUP_X1: return createDupX1(); - case EmftvmPackage.SWAP: return createSwap(); - case EmftvmPackage.SWAP_X1: return createSwapX1(); - case EmftvmPackage.IF: return createIf(); - case EmftvmPackage.IFN: return createIfn(); - case EmftvmPackage.GOTO: return createGoto(); - case EmftvmPackage.ITERATE: return createIterate(); - case EmftvmPackage.ENDITERATE: return createEnditerate(); - case EmftvmPackage.INVOKE: return createInvoke(); - case EmftvmPackage.INVOKE_SUPER: return createInvokeSuper(); - case EmftvmPackage.INVOKE_STATIC: return createInvokeStatic(); - case EmftvmPackage.ALLINST: return createAllinst(); - case EmftvmPackage.ALLINST_IN: return createAllinstIn(); - case EmftvmPackage.ISNULL: return createIsnull(); - case EmftvmPackage.GETENVTYPE: return createGetenvtype(); - case EmftvmPackage.NOT: return createNot(); - case EmftvmPackage.AND: return createAnd(); - case EmftvmPackage.OR: return createOr(); - case EmftvmPackage.XOR: return createXor(); - case EmftvmPackage.IMPLIES: return createImplies(); - case EmftvmPackage.IFTE: return createIfte(); - case EmftvmPackage.RETURN: return createReturn(); - case EmftvmPackage.GETCB: return createGetcb(); - case EmftvmPackage.INVOKE_ALL_CBS: return createInvokeAllCbs(); - case EmftvmPackage.INVOKE_CB: return createInvokeCb(); - case EmftvmPackage.INVOKE_CB_S: return createInvokeCbS(); - case EmftvmPackage.MATCH: return createMatch(); - case EmftvmPackage.MATCH_S: return createMatchS(); - case EmftvmPackage.ADD: return createAdd(); - case EmftvmPackage.REMOVE: return createRemove(); - case EmftvmPackage.INSERT: return createInsert(); - case EmftvmPackage.GET_SUPER: return createGetSuper(); - case EmftvmPackage.GETENV: return createGetenv(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + case EmftvmPackage.EXEC_ENV: return createExecEnv(); + case EmftvmPackage.MODEL: return createModel(); + case EmftvmPackage.METAMODEL: return createMetamodel(); + case EmftvmPackage.MODULE: return createModule(); + case EmftvmPackage.MODEL_DECLARATION: return createModelDeclaration(); + case EmftvmPackage.FIELD: return createField(); + case EmftvmPackage.OPERATION: return createOperation(); + case EmftvmPackage.PARAMETER: return createParameter(); + case EmftvmPackage.LINE_NUMBER: return createLineNumber(); + case EmftvmPackage.LOCAL_VARIABLE: return createLocalVariable(); + case EmftvmPackage.RULE: return createRule(); + case EmftvmPackage.INPUT_RULE_ELEMENT: return createInputRuleElement(); + case EmftvmPackage.OUTPUT_RULE_ELEMENT: return createOutputRuleElement(); + case EmftvmPackage.CODE_BLOCK: return createCodeBlock(); + case EmftvmPackage.PUSH: return createPush(); + case EmftvmPackage.PUSHT: return createPusht(); + case EmftvmPackage.PUSHF: return createPushf(); + case EmftvmPackage.POP: return createPop(); + case EmftvmPackage.LOAD: return createLoad(); + case EmftvmPackage.STORE: return createStore(); + case EmftvmPackage.SET: return createSet(); + case EmftvmPackage.GET: return createGet(); + case EmftvmPackage.GET_TRANS: return createGetTrans(); + case EmftvmPackage.SET_STATIC: return createSetStatic(); + case EmftvmPackage.GET_STATIC: return createGetStatic(); + case EmftvmPackage.FINDTYPE: return createFindtype(); + case EmftvmPackage.FINDTYPE_S: return createFindtypeS(); + case EmftvmPackage.NEW: return createNew(); + case EmftvmPackage.NEW_S: return createNewS(); + case EmftvmPackage.DELETE: return createDelete(); + case EmftvmPackage.DUP: return createDup(); + case EmftvmPackage.DUP_X1: return createDupX1(); + case EmftvmPackage.SWAP: return createSwap(); + case EmftvmPackage.SWAP_X1: return createSwapX1(); + case EmftvmPackage.IF: return createIf(); + case EmftvmPackage.IFN: return createIfn(); + case EmftvmPackage.GOTO: return createGoto(); + case EmftvmPackage.ITERATE: return createIterate(); + case EmftvmPackage.ENDITERATE: return createEnditerate(); + case EmftvmPackage.INVOKE: return createInvoke(); + case EmftvmPackage.INVOKE_SUPER: return createInvokeSuper(); + case EmftvmPackage.INVOKE_STATIC: return createInvokeStatic(); + case EmftvmPackage.ALLINST: return createAllinst(); + case EmftvmPackage.ALLINST_IN: return createAllinstIn(); + case EmftvmPackage.ISNULL: return createIsnull(); + case EmftvmPackage.GETENVTYPE: return createGetenvtype(); + case EmftvmPackage.NOT: return createNot(); + case EmftvmPackage.AND: return createAnd(); + case EmftvmPackage.OR: return createOr(); + case EmftvmPackage.XOR: return createXor(); + case EmftvmPackage.IMPLIES: return createImplies(); + case EmftvmPackage.IFTE: return createIfte(); + case EmftvmPackage.RETURN: return createReturn(); + case EmftvmPackage.GETCB: return createGetcb(); + case EmftvmPackage.INVOKE_ALL_CBS: return createInvokeAllCbs(); + case EmftvmPackage.INVOKE_CB: return createInvokeCb(); + case EmftvmPackage.INVOKE_CB_S: return createInvokeCbS(); + case EmftvmPackage.MATCH: return createMatch(); + case EmftvmPackage.MATCH_S: return createMatchS(); + case EmftvmPackage.ADD: return createAdd(); + case EmftvmPackage.REMOVE: return createRemove(); + case EmftvmPackage.INSERT: return createInsert(); + case EmftvmPackage.GET_SUPER: return createGetSuper(); + case EmftvmPackage.GETENV: return createGetenv(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } } @@ -225,52 +243,52 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ @Override - public Object createFromString(EDataType eDataType, String initialValue) { + public Object createFromString(final EDataType eDataType, final String initialValue) { switch (eDataType.getClassifierID()) { - case EmftvmPackage.MODEL_DECLARATION_TAG: - return createModelDeclarationTagFromString(eDataType, initialValue); - case EmftvmPackage.FEATURE_TAG: - return createFeatureTagFromString(eDataType, initialValue); - case EmftvmPackage.OPCODE: - return createOpcodeFromString(eDataType, initialValue); - case EmftvmPackage.RULE_MODE: - return createRuleModeFromString(eDataType, initialValue); - case EmftvmPackage.CONSTANT_TAG: - return createConstantTagFromString(eDataType, initialValue); - case EmftvmPackage.MODULE_RESOLVER: - return createModuleResolverFromString(eDataType, initialValue); - case EmftvmPackage.ENUM_LITERAL: - return createEnumLiteralFromString(eDataType, initialValue); - case EmftvmPackage.STACK_FRAME: - return createStackFrameFromString(eDataType, initialValue); - case EmftvmPackage.METHOD: - return createMethodFromString(eDataType, initialValue); - case EmftvmPackage.TIMING_DATA: - return createTimingDataFromString(eDataType, initialValue); - case EmftvmPackage.LAZY_COLLECTION: - return createLazyCollectionFromString(eDataType, initialValue); - case EmftvmPackage.LAZY_BAG: - return createLazyBagFromString(eDataType, initialValue); - case EmftvmPackage.LAZY_LIST: - return createLazyListFromString(eDataType, initialValue); - case EmftvmPackage.LAZY_ORDERED_SET: - return createLazyOrderedSetFromString(eDataType, initialValue); - case EmftvmPackage.LAZY_SET: - return createLazySetFromString(eDataType, initialValue); - case EmftvmPackage.EJAVA_OBJECT_ARRAY: - return createEJavaObjectArrayFromString(eDataType, initialValue); - case EmftvmPackage.EOBJECT_ARRAY: - return createEObjectArrayFromString(eDataType, initialValue); - case EmftvmPackage.EBOOLEAN_ARRAY: - return createEBooleanArrayFromString(eDataType, initialValue); - case EmftvmPackage.EJAVA_SET: - return createEJavaSetFromString(eDataType, initialValue); - case EmftvmPackage.EJAVA_ITERABLE: - return createEJavaIterableFromString(eDataType, initialValue); - case EmftvmPackage.CLASS_NOT_FOUND_EXCEPTION: - return createClassNotFoundExceptionFromString(eDataType, initialValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); + case EmftvmPackage.MODEL_DECLARATION_TAG: + return createModelDeclarationTagFromString(eDataType, initialValue); + case EmftvmPackage.FEATURE_TAG: + return createFeatureTagFromString(eDataType, initialValue); + case EmftvmPackage.OPCODE: + return createOpcodeFromString(eDataType, initialValue); + case EmftvmPackage.RULE_MODE: + return createRuleModeFromString(eDataType, initialValue); + case EmftvmPackage.CONSTANT_TAG: + return createConstantTagFromString(eDataType, initialValue); + case EmftvmPackage.MODULE_RESOLVER: + return createModuleResolverFromString(eDataType, initialValue); + case EmftvmPackage.ENUM_LITERAL: + return createEnumLiteralFromString(eDataType, initialValue); + case EmftvmPackage.STACK_FRAME: + return createStackFrameFromString(eDataType, initialValue); + case EmftvmPackage.METHOD: + return createMethodFromString(eDataType, initialValue); + case EmftvmPackage.TIMING_DATA: + return createTimingDataFromString(eDataType, initialValue); + case EmftvmPackage.LAZY_COLLECTION: + return createLazyCollectionFromString(eDataType, initialValue); + case EmftvmPackage.LAZY_BAG: + return createLazyBagFromString(eDataType, initialValue); + case EmftvmPackage.LAZY_LIST: + return createLazyListFromString(eDataType, initialValue); + case EmftvmPackage.LAZY_ORDERED_SET: + return createLazyOrderedSetFromString(eDataType, initialValue); + case EmftvmPackage.LAZY_SET: + return createLazySetFromString(eDataType, initialValue); + case EmftvmPackage.EJAVA_OBJECT_ARRAY: + return createEJavaObjectArrayFromString(eDataType, initialValue); + case EmftvmPackage.EOBJECT_ARRAY: + return createEObjectArrayFromString(eDataType, initialValue); + case EmftvmPackage.EBOOLEAN_ARRAY: + return createEBooleanArrayFromString(eDataType, initialValue); + case EmftvmPackage.EJAVA_SET: + return createEJavaSetFromString(eDataType, initialValue); + case EmftvmPackage.EJAVA_ITERABLE: + return createEJavaIterableFromString(eDataType, initialValue); + case EmftvmPackage.CLASS_NOT_FOUND_EXCEPTION: + return createClassNotFoundExceptionFromString(eDataType, initialValue); + default: + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } } @@ -281,52 +299,52 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ @Override - public String convertToString(EDataType eDataType, Object instanceValue) { + public String convertToString(final EDataType eDataType, final Object instanceValue) { switch (eDataType.getClassifierID()) { - case EmftvmPackage.MODEL_DECLARATION_TAG: - return convertModelDeclarationTagToString(eDataType, instanceValue); - case EmftvmPackage.FEATURE_TAG: - return convertFeatureTagToString(eDataType, instanceValue); - case EmftvmPackage.OPCODE: - return convertOpcodeToString(eDataType, instanceValue); - case EmftvmPackage.RULE_MODE: - return convertRuleModeToString(eDataType, instanceValue); - case EmftvmPackage.CONSTANT_TAG: - return convertConstantTagToString(eDataType, instanceValue); - case EmftvmPackage.MODULE_RESOLVER: - return convertModuleResolverToString(eDataType, instanceValue); - case EmftvmPackage.ENUM_LITERAL: - return convertEnumLiteralToString(eDataType, instanceValue); - case EmftvmPackage.STACK_FRAME: - return convertStackFrameToString(eDataType, instanceValue); - case EmftvmPackage.METHOD: - return convertMethodToString(eDataType, instanceValue); - case EmftvmPackage.TIMING_DATA: - return convertTimingDataToString(eDataType, instanceValue); - case EmftvmPackage.LAZY_COLLECTION: - return convertLazyCollectionToString(eDataType, instanceValue); - case EmftvmPackage.LAZY_BAG: - return convertLazyBagToString(eDataType, instanceValue); - case EmftvmPackage.LAZY_LIST: - return convertLazyListToString(eDataType, instanceValue); - case EmftvmPackage.LAZY_ORDERED_SET: - return convertLazyOrderedSetToString(eDataType, instanceValue); - case EmftvmPackage.LAZY_SET: - return convertLazySetToString(eDataType, instanceValue); - case EmftvmPackage.EJAVA_OBJECT_ARRAY: - return convertEJavaObjectArrayToString(eDataType, instanceValue); - case EmftvmPackage.EOBJECT_ARRAY: - return convertEObjectArrayToString(eDataType, instanceValue); - case EmftvmPackage.EBOOLEAN_ARRAY: - return convertEBooleanArrayToString(eDataType, instanceValue); - case EmftvmPackage.EJAVA_SET: - return convertEJavaSetToString(eDataType, instanceValue); - case EmftvmPackage.EJAVA_ITERABLE: - return convertEJavaIterableToString(eDataType, instanceValue); - case EmftvmPackage.CLASS_NOT_FOUND_EXCEPTION: - return convertClassNotFoundExceptionToString(eDataType, instanceValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); + case EmftvmPackage.MODEL_DECLARATION_TAG: + return convertModelDeclarationTagToString(eDataType, instanceValue); + case EmftvmPackage.FEATURE_TAG: + return convertFeatureTagToString(eDataType, instanceValue); + case EmftvmPackage.OPCODE: + return convertOpcodeToString(eDataType, instanceValue); + case EmftvmPackage.RULE_MODE: + return convertRuleModeToString(eDataType, instanceValue); + case EmftvmPackage.CONSTANT_TAG: + return convertConstantTagToString(eDataType, instanceValue); + case EmftvmPackage.MODULE_RESOLVER: + return convertModuleResolverToString(eDataType, instanceValue); + case EmftvmPackage.ENUM_LITERAL: + return convertEnumLiteralToString(eDataType, instanceValue); + case EmftvmPackage.STACK_FRAME: + return convertStackFrameToString(eDataType, instanceValue); + case EmftvmPackage.METHOD: + return convertMethodToString(eDataType, instanceValue); + case EmftvmPackage.TIMING_DATA: + return convertTimingDataToString(eDataType, instanceValue); + case EmftvmPackage.LAZY_COLLECTION: + return convertLazyCollectionToString(eDataType, instanceValue); + case EmftvmPackage.LAZY_BAG: + return convertLazyBagToString(eDataType, instanceValue); + case EmftvmPackage.LAZY_LIST: + return convertLazyListToString(eDataType, instanceValue); + case EmftvmPackage.LAZY_ORDERED_SET: + return convertLazyOrderedSetToString(eDataType, instanceValue); + case EmftvmPackage.LAZY_SET: + return convertLazySetToString(eDataType, instanceValue); + case EmftvmPackage.EJAVA_OBJECT_ARRAY: + return convertEJavaObjectArrayToString(eDataType, instanceValue); + case EmftvmPackage.EOBJECT_ARRAY: + return convertEObjectArrayToString(eDataType, instanceValue); + case EmftvmPackage.EBOOLEAN_ARRAY: + return convertEBooleanArrayToString(eDataType, instanceValue); + case EmftvmPackage.EJAVA_SET: + return convertEJavaSetToString(eDataType, instanceValue); + case EmftvmPackage.EJAVA_ITERABLE: + return convertEJavaIterableToString(eDataType, instanceValue); + case EmftvmPackage.CLASS_NOT_FOUND_EXCEPTION: + return convertClassNotFoundExceptionToString(eDataType, instanceValue); + default: + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } } @@ -337,7 +355,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Module createModule() { - ModuleImpl module = new ModuleImpl(); + final ModuleImpl module = new ModuleImpl(); return module; } @@ -348,7 +366,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public ModelDeclaration createModelDeclaration() { - ModelDeclarationImpl modelDeclaration = new ModelDeclarationImpl(); + final ModelDeclarationImpl modelDeclaration = new ModelDeclarationImpl(); return modelDeclaration; } @@ -359,7 +377,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Field createField() { - FieldImpl field = new FieldImpl(); + final FieldImpl field = new FieldImpl(); return field; } @@ -370,7 +388,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Operation createOperation() { - OperationImpl operation = new OperationImpl(); + final OperationImpl operation = new OperationImpl(); return operation; } @@ -381,7 +399,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Parameter createParameter() { - ParameterImpl parameter = new ParameterImpl(); + final ParameterImpl parameter = new ParameterImpl(); return parameter; } @@ -392,7 +410,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public LineNumber createLineNumber() { - LineNumberImpl lineNumber = new LineNumberImpl(); + final LineNumberImpl lineNumber = new LineNumberImpl(); return lineNumber; } @@ -403,7 +421,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public LocalVariable createLocalVariable() { - LocalVariableImpl localVariable = new LocalVariableImpl(); + final LocalVariableImpl localVariable = new LocalVariableImpl(); return localVariable; } @@ -414,7 +432,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Rule createRule() { - RuleImpl rule = new RuleImpl(); + final RuleImpl rule = new RuleImpl(); return rule; } @@ -425,7 +443,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public InputRuleElement createInputRuleElement() { - InputRuleElementImpl inputRuleElement = new InputRuleElementImpl(); + final InputRuleElementImpl inputRuleElement = new InputRuleElementImpl(); return inputRuleElement; } @@ -436,7 +454,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public OutputRuleElement createOutputRuleElement() { - OutputRuleElementImpl outputRuleElement = new OutputRuleElementImpl(); + final OutputRuleElementImpl outputRuleElement = new OutputRuleElementImpl(); return outputRuleElement; } @@ -447,7 +465,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public CodeBlock createCodeBlock() { - CodeBlockImpl codeBlock = new CodeBlockImpl(); + final CodeBlockImpl codeBlock = new CodeBlockImpl(); return codeBlock; } @@ -458,7 +476,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Push createPush() { - PushImpl push = new PushImpl(); + final PushImpl push = new PushImpl(); return push; } @@ -469,7 +487,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Pusht createPusht() { - PushtImpl pusht = new PushtImpl(); + final PushtImpl pusht = new PushtImpl(); return pusht; } @@ -480,7 +498,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Pushf createPushf() { - PushfImpl pushf = new PushfImpl(); + final PushfImpl pushf = new PushfImpl(); return pushf; } @@ -491,7 +509,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Pop createPop() { - PopImpl pop = new PopImpl(); + final PopImpl pop = new PopImpl(); return pop; } @@ -502,7 +520,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Load createLoad() { - LoadImpl load = new LoadImpl(); + final LoadImpl load = new LoadImpl(); return load; } @@ -513,7 +531,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Store createStore() { - StoreImpl store = new StoreImpl(); + final StoreImpl store = new StoreImpl(); return store; } @@ -524,7 +542,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Set createSet() { - SetImpl set = new SetImpl(); + final SetImpl set = new SetImpl(); return set; } @@ -535,7 +553,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Get createGet() { - GetImpl get = new GetImpl(); + final GetImpl get = new GetImpl(); return get; } @@ -546,7 +564,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public GetTrans createGetTrans() { - GetTransImpl getTrans = new GetTransImpl(); + final GetTransImpl getTrans = new GetTransImpl(); return getTrans; } @@ -557,7 +575,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public SetStatic createSetStatic() { - SetStaticImpl setStatic = new SetStaticImpl(); + final SetStaticImpl setStatic = new SetStaticImpl(); return setStatic; } @@ -568,7 +586,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public GetStatic createGetStatic() { - GetStaticImpl getStatic = new GetStaticImpl(); + final GetStaticImpl getStatic = new GetStaticImpl(); return getStatic; } @@ -579,7 +597,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Findtype createFindtype() { - FindtypeImpl findtype = new FindtypeImpl(); + final FindtypeImpl findtype = new FindtypeImpl(); return findtype; } @@ -590,7 +608,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public FindtypeS createFindtypeS() { - FindtypeSImpl findtypeS = new FindtypeSImpl(); + final FindtypeSImpl findtypeS = new FindtypeSImpl(); return findtypeS; } @@ -601,7 +619,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public New createNew() { - NewImpl new_ = new NewImpl(); + final NewImpl new_ = new NewImpl(); return new_; } @@ -612,7 +630,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public NewS createNewS() { - NewSImpl newS = new NewSImpl(); + final NewSImpl newS = new NewSImpl(); return newS; } @@ -623,7 +641,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Delete createDelete() { - DeleteImpl delete = new DeleteImpl(); + final DeleteImpl delete = new DeleteImpl(); return delete; } @@ -634,7 +652,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Dup createDup() { - DupImpl dup = new DupImpl(); + final DupImpl dup = new DupImpl(); return dup; } @@ -645,7 +663,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public DupX1 createDupX1() { - DupX1Impl dupX1 = new DupX1Impl(); + final DupX1Impl dupX1 = new DupX1Impl(); return dupX1; } @@ -656,7 +674,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Swap createSwap() { - SwapImpl swap = new SwapImpl(); + final SwapImpl swap = new SwapImpl(); return swap; } @@ -667,7 +685,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public SwapX1 createSwapX1() { - SwapX1Impl swapX1 = new SwapX1Impl(); + final SwapX1Impl swapX1 = new SwapX1Impl(); return swapX1; } @@ -678,7 +696,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public If createIf() { - IfImpl if_ = new IfImpl(); + final IfImpl if_ = new IfImpl(); return if_; } @@ -689,7 +707,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Ifn createIfn() { - IfnImpl ifn = new IfnImpl(); + final IfnImpl ifn = new IfnImpl(); return ifn; } @@ -700,7 +718,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Goto createGoto() { - GotoImpl goto_ = new GotoImpl(); + final GotoImpl goto_ = new GotoImpl(); return goto_; } @@ -711,7 +729,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Iterate createIterate() { - IterateImpl iterate = new IterateImpl(); + final IterateImpl iterate = new IterateImpl(); return iterate; } @@ -722,7 +740,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Enditerate createEnditerate() { - EnditerateImpl enditerate = new EnditerateImpl(); + final EnditerateImpl enditerate = new EnditerateImpl(); return enditerate; } @@ -733,7 +751,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Invoke createInvoke() { - InvokeImpl invoke = new InvokeImpl(); + final InvokeImpl invoke = new InvokeImpl(); return invoke; } @@ -744,7 +762,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public InvokeSuper createInvokeSuper() { - InvokeSuperImpl invokeSuper = new InvokeSuperImpl(); + final InvokeSuperImpl invokeSuper = new InvokeSuperImpl(); return invokeSuper; } @@ -755,7 +773,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public InvokeStatic createInvokeStatic() { - InvokeStaticImpl invokeStatic = new InvokeStaticImpl(); + final InvokeStaticImpl invokeStatic = new InvokeStaticImpl(); return invokeStatic; } @@ -766,7 +784,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Allinst createAllinst() { - AllinstImpl allinst = new AllinstImpl(); + final AllinstImpl allinst = new AllinstImpl(); return allinst; } @@ -777,7 +795,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public AllinstIn createAllinstIn() { - AllinstInImpl allinstIn = new AllinstInImpl(); + final AllinstInImpl allinstIn = new AllinstInImpl(); return allinstIn; } @@ -788,7 +806,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Match createMatch() { - MatchImpl match = new MatchImpl(); + final MatchImpl match = new MatchImpl(); return match; } @@ -799,7 +817,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public MatchS createMatchS() { - MatchSImpl matchS = new MatchSImpl(); + final MatchSImpl matchS = new MatchSImpl(); return matchS; } @@ -810,7 +828,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Add createAdd() { - AddImpl add = new AddImpl(); + final AddImpl add = new AddImpl(); return add; } @@ -821,7 +839,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Remove createRemove() { - RemoveImpl remove = new RemoveImpl(); + final RemoveImpl remove = new RemoveImpl(); return remove; } @@ -832,7 +850,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Insert createInsert() { - InsertImpl insert = new InsertImpl(); + final InsertImpl insert = new InsertImpl(); return insert; } @@ -842,7 +860,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public GetSuper createGetSuper() { - GetSuperImpl getSuper = new GetSuperImpl(); + final GetSuperImpl getSuper = new GetSuperImpl(); return getSuper; } @@ -852,7 +870,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Getenv createGetenv() { - GetenvImpl getenv = new GetenvImpl(); + final GetenvImpl getenv = new GetenvImpl(); return getenv; } @@ -863,7 +881,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Return createReturn() { - ReturnImpl return_ = new ReturnImpl(); + final ReturnImpl return_ = new ReturnImpl(); return return_; } @@ -874,7 +892,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Getcb createGetcb() { - GetcbImpl getcb = new GetcbImpl(); + final GetcbImpl getcb = new GetcbImpl(); return getcb; } @@ -885,7 +903,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public InvokeAllCbs createInvokeAllCbs() { - InvokeAllCbsImpl invokeAllCbs = new InvokeAllCbsImpl(); + final InvokeAllCbsImpl invokeAllCbs = new InvokeAllCbsImpl(); return invokeAllCbs; } @@ -896,7 +914,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public InvokeCb createInvokeCb() { - InvokeCbImpl invokeCb = new InvokeCbImpl(); + final InvokeCbImpl invokeCb = new InvokeCbImpl(); return invokeCb; } @@ -907,7 +925,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public InvokeCbS createInvokeCbS() { - InvokeCbSImpl invokeCbS = new InvokeCbSImpl(); + final InvokeCbSImpl invokeCbS = new InvokeCbSImpl(); return invokeCbS; } @@ -917,8 +935,8 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public ModelDeclarationTag createModelDeclarationTagFromString(EDataType eDataType, String initialValue) { - ModelDeclarationTag result = ModelDeclarationTag.get(initialValue); + public ModelDeclarationTag createModelDeclarationTagFromString(final EDataType eDataType, final String initialValue) { + final ModelDeclarationTag result = ModelDeclarationTag.get(initialValue); if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); return result; } @@ -929,7 +947,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertModelDeclarationTagToString(EDataType eDataType, Object instanceValue) { + public String convertModelDeclarationTagToString(final EDataType eDataType, final Object instanceValue) { return instanceValue == null ? null : instanceValue.toString(); } @@ -940,7 +958,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Not createNot() { - NotImpl not = new NotImpl(); + final NotImpl not = new NotImpl(); return not; } @@ -951,7 +969,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public And createAnd() { - AndImpl and = new AndImpl(); + final AndImpl and = new AndImpl(); return and; } @@ -962,7 +980,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Or createOr() { - OrImpl or = new OrImpl(); + final OrImpl or = new OrImpl(); return or; } @@ -973,7 +991,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Xor createXor() { - XorImpl xor = new XorImpl(); + final XorImpl xor = new XorImpl(); return xor; } @@ -984,7 +1002,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Implies createImplies() { - ImpliesImpl implies = new ImpliesImpl(); + final ImpliesImpl implies = new ImpliesImpl(); return implies; } @@ -995,7 +1013,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Ifte createIfte() { - IfteImpl ifte = new IfteImpl(); + final IfteImpl ifte = new IfteImpl(); return ifte; } @@ -1006,7 +1024,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Isnull createIsnull() { - IsnullImpl isnull = new IsnullImpl(); + final IsnullImpl isnull = new IsnullImpl(); return isnull; } @@ -1017,7 +1035,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Getenvtype createGetenvtype() { - GetenvtypeImpl getenvtype = new GetenvtypeImpl(); + final GetenvtypeImpl getenvtype = new GetenvtypeImpl(); return getenvtype; } @@ -1027,8 +1045,8 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public FeatureTag createFeatureTagFromString(EDataType eDataType, String initialValue) { - FeatureTag result = FeatureTag.get(initialValue); + public FeatureTag createFeatureTagFromString(final EDataType eDataType, final String initialValue) { + final FeatureTag result = FeatureTag.get(initialValue); if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); return result; } @@ -1039,7 +1057,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertFeatureTagToString(EDataType eDataType, Object instanceValue) { + public String convertFeatureTagToString(final EDataType eDataType, final Object instanceValue) { return instanceValue == null ? null : instanceValue.toString(); } @@ -1050,7 +1068,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public ExecEnv createExecEnv() { - ExecEnvImpl execEnv = new ExecEnvImpl(); + final ExecEnvImpl execEnv = new ExecEnvImpl(); return execEnv; } @@ -1061,7 +1079,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Model createModel() { - ModelImpl model = new ModelImpl(); + final ModelImpl model = new ModelImpl(); return model; } @@ -1072,7 +1090,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * @generated */ public Metamodel createMetamodel() { - MetamodelImpl metamodel = new MetamodelImpl(); + final MetamodelImpl metamodel = new MetamodelImpl(); return metamodel; } @@ -1082,8 +1100,8 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public Opcode createOpcodeFromString(EDataType eDataType, String initialValue) { - Opcode result = Opcode.get(initialValue); + public Opcode createOpcodeFromString(final EDataType eDataType, final String initialValue) { + final Opcode result = Opcode.get(initialValue); if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); return result; } @@ -1094,7 +1112,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertOpcodeToString(EDataType eDataType, Object instanceValue) { + public String convertOpcodeToString(final EDataType eDataType, final Object instanceValue) { return instanceValue == null ? null : instanceValue.toString(); } @@ -1104,8 +1122,8 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public RuleMode createRuleModeFromString(EDataType eDataType, String initialValue) { - RuleMode result = RuleMode.get(initialValue); + public RuleMode createRuleModeFromString(final EDataType eDataType, final String initialValue) { + final RuleMode result = RuleMode.get(initialValue); if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); return result; } @@ -1116,7 +1134,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertRuleModeToString(EDataType eDataType, Object instanceValue) { + public String convertRuleModeToString(final EDataType eDataType, final Object instanceValue) { return instanceValue == null ? null : instanceValue.toString(); } @@ -1126,8 +1144,8 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public ConstantTag createConstantTagFromString(EDataType eDataType, String initialValue) { - ConstantTag result = ConstantTag.get(initialValue); + public ConstantTag createConstantTagFromString(final EDataType eDataType, final String initialValue) { + final ConstantTag result = ConstantTag.get(initialValue); if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); return result; } @@ -1138,7 +1156,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertConstantTagToString(EDataType eDataType, Object instanceValue) { + public String convertConstantTagToString(final EDataType eDataType, final Object instanceValue) { return instanceValue == null ? null : instanceValue.toString(); } @@ -1148,7 +1166,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public StackFrame createStackFrameFromString(EDataType eDataType, String initialValue) { + public StackFrame createStackFrameFromString(final EDataType eDataType, final String initialValue) { return (StackFrame)super.createFromString(eDataType, initialValue); } @@ -1158,7 +1176,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertStackFrameToString(EDataType eDataType, Object instanceValue) { + public String convertStackFrameToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -1168,7 +1186,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public Method createMethodFromString(EDataType eDataType, String initialValue) { + public Method createMethodFromString(final EDataType eDataType, final String initialValue) { return (Method)super.createFromString(eDataType, initialValue); } @@ -1178,7 +1196,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertMethodToString(EDataType eDataType, Object instanceValue) { + public String convertMethodToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -1188,7 +1206,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public TimingData createTimingDataFromString(EDataType eDataType, String initialValue) { + public TimingData createTimingDataFromString(final EDataType eDataType, final String initialValue) { return (TimingData)super.createFromString(eDataType, initialValue); } @@ -1198,7 +1216,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertTimingDataToString(EDataType eDataType, Object instanceValue) { + public String convertTimingDataToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -1208,7 +1226,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public LazyCollection<?> createLazyCollectionFromString(EDataType eDataType, String initialValue) { + public LazyCollection<?> createLazyCollectionFromString(final EDataType eDataType, final String initialValue) { return (LazyCollection<?>)super.createFromString(initialValue); } @@ -1218,7 +1236,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertLazyCollectionToString(EDataType eDataType, Object instanceValue) { + public String convertLazyCollectionToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1228,7 +1246,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public LazyBag<?> createLazyBagFromString(EDataType eDataType, String initialValue) { + public LazyBag<?> createLazyBagFromString(final EDataType eDataType, final String initialValue) { return (LazyBag<?>)super.createFromString(initialValue); } @@ -1238,7 +1256,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertLazyBagToString(EDataType eDataType, Object instanceValue) { + public String convertLazyBagToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1248,7 +1266,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public LazyList<?> createLazyListFromString(EDataType eDataType, String initialValue) { + public LazyList<?> createLazyListFromString(final EDataType eDataType, final String initialValue) { return (LazyList<?>)super.createFromString(initialValue); } @@ -1258,7 +1276,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertLazyListToString(EDataType eDataType, Object instanceValue) { + public String convertLazyListToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1268,7 +1286,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public LazyOrderedSet<?> createLazyOrderedSetFromString(EDataType eDataType, String initialValue) { + public LazyOrderedSet<?> createLazyOrderedSetFromString(final EDataType eDataType, final String initialValue) { return (LazyOrderedSet<?>)super.createFromString(initialValue); } @@ -1278,7 +1296,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertLazyOrderedSetToString(EDataType eDataType, Object instanceValue) { + public String convertLazyOrderedSetToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1288,7 +1306,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public LazySet<?> createLazySetFromString(EDataType eDataType, String initialValue) { + public LazySet<?> createLazySetFromString(final EDataType eDataType, final String initialValue) { return (LazySet<?>)super.createFromString(initialValue); } @@ -1298,7 +1316,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertLazySetToString(EDataType eDataType, Object instanceValue) { + public String convertLazySetToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1307,7 +1325,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public Object[] createEJavaObjectArrayFromString(EDataType eDataType, String initialValue) { + public Object[] createEJavaObjectArrayFromString(final EDataType eDataType, final String initialValue) { return (Object[])super.createFromString(initialValue); } @@ -1316,7 +1334,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertEJavaObjectArrayToString(EDataType eDataType, Object instanceValue) { + public String convertEJavaObjectArrayToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1325,7 +1343,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public EObject[] createEObjectArrayFromString(EDataType eDataType, String initialValue) { + public EObject[] createEObjectArrayFromString(final EDataType eDataType, final String initialValue) { return (EObject[])super.createFromString(initialValue); } @@ -1334,7 +1352,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertEObjectArrayToString(EDataType eDataType, Object instanceValue) { + public String convertEObjectArrayToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1343,7 +1361,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public boolean[] createEBooleanArrayFromString(EDataType eDataType, String initialValue) { + public boolean[] createEBooleanArrayFromString(final EDataType eDataType, final String initialValue) { return (boolean[])super.createFromString(initialValue); } @@ -1352,7 +1370,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertEBooleanArrayToString(EDataType eDataType, Object instanceValue) { + public String convertEBooleanArrayToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1361,7 +1379,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public java.util.Set<?> createEJavaSetFromString(EDataType eDataType, String initialValue) { + public java.util.Set<?> createEJavaSetFromString(final EDataType eDataType, final String initialValue) { return (java.util.Set<?>)super.createFromString(initialValue); } @@ -1370,7 +1388,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertEJavaSetToString(EDataType eDataType, Object instanceValue) { + public String convertEJavaSetToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1379,7 +1397,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public Iterable<?> createEJavaIterableFromString(EDataType eDataType, String initialValue) { + public Iterable<?> createEJavaIterableFromString(final EDataType eDataType, final String initialValue) { return (Iterable<?>)super.createFromString(initialValue); } @@ -1388,7 +1406,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertEJavaIterableToString(EDataType eDataType, Object instanceValue) { + public String convertEJavaIterableToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(instanceValue); } @@ -1397,7 +1415,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public ClassNotFoundException createClassNotFoundExceptionFromString(EDataType eDataType, String initialValue) { + public ClassNotFoundException createClassNotFoundExceptionFromString(final EDataType eDataType, final String initialValue) { return (ClassNotFoundException)super.createFromString(eDataType, initialValue); } @@ -1406,7 +1424,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertClassNotFoundExceptionToString(EDataType eDataType, Object instanceValue) { + public String convertClassNotFoundExceptionToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -1416,7 +1434,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public ModuleResolver createModuleResolverFromString(EDataType eDataType, String initialValue) { + public ModuleResolver createModuleResolverFromString(final EDataType eDataType, final String initialValue) { return (ModuleResolver)super.createFromString(eDataType, initialValue); } @@ -1426,7 +1444,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertModuleResolverToString(EDataType eDataType, Object instanceValue) { + public String convertModuleResolverToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -1436,7 +1454,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public EnumLiteral createEnumLiteralFromString(EDataType eDataType, String initialValue) { + public EnumLiteral createEnumLiteralFromString(final EDataType eDataType, final String initialValue) { return (EnumLiteral)super.createFromString(eDataType, initialValue); } @@ -1446,7 +1464,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { * <!-- end-user-doc --> * @generated */ - public String convertEnumLiteralToString(EDataType eDataType, Object instanceValue) { + public String convertEnumLiteralToString(final EDataType eDataType, final Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -1475,7 +1493,7 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { /** * {@inheritDoc} */ - public Instruction createInstruction(Opcode opcode) { + public Instruction createInstruction(final Opcode opcode) { switch (opcode) { case PUSH: return createPush(); case PUSHT: return createPusht(); @@ -1532,4 +1550,57 @@ public class EmftvmFactoryImpl extends EFactoryImpl implements EmftvmFactory { } } + /** + * {@inheritDoc} + */ + public Model createModel(final Resource resource) { + final TypeMap<Class<?>, ModelFactory> modelFactoryRegistry = getModelFactoryRegistry(); + final Object key = modelFactoryRegistry.findKey(resource.getClass()); + if (key != null) { + return modelFactoryRegistry.get(key).createModel(resource); + } + return defaultModelFactory.createModel(resource); + } + + /** + * {@inheritDoc} + */ + public Metamodel createMetamodel(final Resource resource) { + final TypeMap<Class<?>, ModelFactory> modelFactoryRegistry = getModelFactoryRegistry(); + final Object key = modelFactoryRegistry.findKey(resource.getClass()); + if (key != null) { + return modelFactoryRegistry.get(key).createMetamodel(resource); + } + return defaultModelFactory.createMetamodel(resource); + } + + /** + * @return the modelFactoryRegistry + */ + protected TypeMap<Class<?>, ModelFactory> getModelFactoryRegistry() { + if (modelFactoryRegistry == null) { + modelFactoryRegistry = createModelFactoryRegistry(); + } + return modelFactoryRegistry; + } + + private TypeMap<Class<?>, ModelFactory> createModelFactoryRegistry() { + PluginExtensionUtil peUtil; + try { + peUtil = (PluginExtensionUtil) Class.forName(PLUGIN_EXTENSION_UTIL_IMPL).newInstance(); + return peUtil.createModelFactoryRegistry(); + } catch (final InstantiationException e) { + ATLLogger.log(Level.FINE, e.getMessage(), e); + } catch (final IllegalAccessException e) { + ATLLogger.log(Level.FINE, e.getMessage(), e); + } catch (final ClassNotFoundException e) { + ATLLogger.log(Level.FINE, e.getMessage(), e); + } catch (final SecurityException e) { + ATLLogger.log(Level.FINE, e.getMessage(), e); + } catch (final NoClassDefFoundError e) { + ATLLogger.log(Level.FINE, e.getMessage(), e); + } + return new TypeHashMap<Class<?>, ModelFactory>(); + } + } //EmftvmFactoryImpl diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmPackageImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmPackageImpl.java index 6982ac6d..b2ffa9a5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmPackageImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmPackageImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EnditerateImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EnditerateImpl.java index 8849ce2b..e9e45b0d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EnditerateImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EnditerateImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ExecEnvImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ExecEnvImpl.java index c1c080be..594c1af3 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ExecEnvImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ExecEnvImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2018 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -117,7 +117,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * @author Dennis Wagelaar <dennis.wagelaar@vub.ac.be> */ abstract class QueueEntry { - + /** * The stack frame context in which to perform the queued operation. */ @@ -155,9 +155,9 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * Performs the queued operation. */ protected abstract void perform(); - + } - + /** * Hold data for element deletion. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> @@ -181,7 +181,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { /** * {@inheritDoc} - * + * * @throws UnsupportedOperationException */ @Override @@ -191,7 +191,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { /** * {@inheritDoc} - * + * * Performs the actual deletion of the element from its model. */ @Override @@ -208,7 +208,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { /** * Performs the queued operation for the given <code>ref</code>. - * + * * @param o * the object for which to delete from <code>ref</code> * @param ref @@ -230,7 +230,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { } } - + /** * Holds data for a queued remap() operation. * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> @@ -249,7 +249,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { /** * Creates a new {@link RemapEntry}. - * + * * @param source * the source element to remap * @param target @@ -265,7 +265,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { /** * {@inheritDoc} - * + * * @throws UnsupportedOperationException */ @Override @@ -275,7 +275,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { /** * Performs the queued operation for the given <code>ref</code>. - * + * * @param o * the object for which to remap <code>ref</code> * @param ref @@ -297,7 +297,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { /** * Performs the queued operation for the given <code>ref</code> and <code>index</code>. - * + * * @param o * the object for which to remap <code>ref</code> * @param ref @@ -447,7 +447,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { /** * The internal value of the '{@link #getMetaModels() <em>Meta Models</em>}' attribute. */ - protected final Map<String, Metamodel> internalMetaModels = + protected final Map<String, Metamodel> internalMetaModels = Collections.synchronizedMap(new HashMap<String, Metamodel>()); /** @@ -479,7 +479,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * Intended for keeping track of cyclic imports. */ protected final Set<String> loadedModules = new HashSet<String>(); - + /** * The chain of '<code>main()</code>' operations to be executed after the automatic rules. */ @@ -491,7 +491,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { protected final EList<Operation> initChain = new BasicEList<Operation>(); /** - * Field storage and lookup. + * Field storage and lookup. */ protected final FieldContainer fieldContainer = new FieldContainer(); @@ -501,8 +501,8 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * eventually pointing to an {@link Operation}. * Example: for argcount = 2: (name -> (2 -> (context -> (arg1 -> (arg2 -> op))))) */ - protected final Map<String, Map<Integer, TypeMap<Object, Object>>> operations = - new HashMap<String, Map<Integer,TypeMap<Object,Object>>>(); + protected final Map<String, Map<Integer, TypeMap<Object, Object>>> operations = + new HashMap<String, Map<Integer,TypeMap<Object,Object>>>(); /** * Lookup table for static operations: (name -> (argcount -> (context -> ?))) @@ -510,8 +510,8 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * eventually pointing to an {@link Operation}. * Example: for argcount = 2: (name -> (2 -> (context -> (arg1 -> (arg2 -> op))))) */ - protected final Map<String, Map<Integer, TypeMap<Object, Object>>> staticOperations = - new HashMap<String, Map<Integer,TypeMap<Object,Object>>>(); + protected final Map<String, Map<Integer, TypeMap<Object, Object>>> staticOperations = + new HashMap<String, Map<Integer,TypeMap<Object,Object>>>(); /** * Lookup table for rules: (name -> rule). @@ -579,7 +579,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * queue entry per source value to remap is supported. */ protected final Map<EObject, RemapEntry> remapQueue = new HashMap<EObject, RemapEntry>(); - + /** * Code block stack level validator. */ @@ -631,7 +631,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * @param type field type model and name * @param initialiser field initialiser codeblock */ - private void createField(final String name, final boolean isStatic, + private void createField(final String name, final boolean isStatic, final String[] context, final String[] type, final CodeBlock initialiser) { final Field f = EMFTVMUtil.createField(name, isStatic, context, type, initialiser); registerFeature(f); @@ -1221,7 +1221,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { public Module loadModule(final ModuleResolver resolver, final String name) { return loadModule(resolver, name, true); } - + /** * <!-- begin-user-doc. --> * {@inheritDoc} @@ -1268,7 +1268,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { return module; } catch (final Exception e) { throw new VMException(null, String.format( - "Error during module loading: %s", + "Error during module loading: %s", e.getMessage()), e); } } @@ -1283,8 +1283,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { if (diag.getSeverity() != Diagnostic.OK) { return diag; } - final Model mmodel = EmftvmFactory.eINSTANCE.createModel(); - mmodel.setResource(module.eResource()); + final Model mmodel = EmftvmFactory.eINSTANCE.createModel(module.eResource()); for (final EObject eObject : mmodel.allInstancesOf(EmftvmPackage.eINSTANCE.getCodeBlock())) { final CodeBlock cb = (CodeBlock) eObject; if (!cbStackValidator.validate(cb)) { @@ -1436,8 +1435,8 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * @return <code>true</code> iff the types of <pre>first</pre> are more specific than the types of <pre>second</pre> */ private static boolean isMoreSpecific( - final EList<Parameter> first, - final EList<Parameter> second, + final EList<Parameter> first, + final EList<Parameter> second, final int index) { assert first.size() == second.size(); final EClassifier f = first.get(index).getEType(); @@ -1470,7 +1469,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * @return <code>true</code> iff the types of <pre>first</pre> are more specific than the types of <pre>second</pre> */ private static boolean isMoreSpecific( - final Operation first, + final Operation first, final Operation second) { final EClassifier f = first.getEContext(); final EClassifier s = second.getEContext(); @@ -1506,7 +1505,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { final Rule oldRule = rules.get(rName); if (r.getMode() != oldRule.getMode()) { throw new IllegalArgumentException(String.format( - "Rule %s with mode %s cannot redefine existing rule with mode %s", + "Rule %s with mode %s cannot redefine existing rule with mode %s", rName, r.getMode(), oldRule.getMode())); } } @@ -1559,7 +1558,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { //check rule type consistency if (superRule.getMode() != rule.getMode()) { throw new IllegalArgumentException(String.format( - "Rule %s with mode %s cannot inherit from super-rule %s with mode %s", + "Rule %s with mode %s cannot inherit from super-rule %s with mode %s", rule.getName(), rule.getMode(), superRule.getName(), superRule.getMode())); } //check type consistency of rule element declarations @@ -1570,10 +1569,10 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { throw new IllegalArgumentException(String.format( "Output element %s of type %s in rule %s is not compatible with element %s of type %s in super-rule %s", re.getName(), - EMFTVMUtil.toPrettyString(re.getEType(), this), + EMFTVMUtil.toPrettyString(re.getEType(), this), rule.getName(), sre.getName(), - EMFTVMUtil.toPrettyString(sre.getEType(), this), + EMFTVMUtil.toPrettyString(sre.getEType(), this), superRule.getName())); } } @@ -1651,7 +1650,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { // There are operations with the given name final int argCount = parameterTypes.length; final TypeMap<Object, Object> ctxMap = argcountOpsMap.get(argCount); - + if (ctxMap != null) { // There are operations with argCount arguments // First try to find with direct types @@ -1682,7 +1681,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { } } } - + return op; } @@ -1699,7 +1698,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { if (argcountOpsMap != null) { // There are operations with the given name final TypeMap<Object, Object> ctxMap = argcountOpsMap.get(0); - + if (ctxMap != null) { // There are operations with 0 arguments // First try to find with direct type @@ -1717,7 +1716,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { } } } - + return op; } @@ -1735,7 +1734,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { if (argcountOpsMap != null) { // There are operations with the given name final TypeMap<Object, Object> ctxMap = argcountOpsMap.get(1); - + if (ctxMap != null) { // There are operations with 1 argument // First try to find with direct types @@ -1771,7 +1770,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { } } } - + return op; } @@ -1804,7 +1803,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { // There are operations with the given name final int argCount = parameterTypes.length; final TypeMap<Object, Object> ctxMap = argcountOpsMap.get(argCount); - + if (ctxMap != null) { // There are operations with argCount arguments // Static operations must be defined in exact context type @@ -1825,7 +1824,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { } } } - + return op; } @@ -1842,14 +1841,14 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { if (argcountOpsMap != null) { // There are operations with the given name final TypeMap<Object, Object> ctxMap = argcountOpsMap.get(0); - + if (ctxMap != null) { // There are operations with 0 arguments // Static operations must be defined in exact context type op = (Operation)ctxMap.get(context); } } - + return op; } @@ -1867,7 +1866,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { if (argcountOpsMap != null) { // There are operations with the given name final TypeMap<Object, Object> ctxMap = argcountOpsMap.get(1); - + if (ctxMap != null) { // There are operations with 1 argument // Static operations must be defined in exact context type @@ -1898,7 +1897,7 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { } } } - + return op; } @@ -1924,12 +1923,12 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * @return the operation, or <code>null</code> */ @SuppressWarnings("unchecked") - private static Operation findOperationDirect(final TypeMap<Object, Object> typeMap, final Object[] parameterTypes, + private static Operation findOperationDirect(final TypeMap<Object, Object> typeMap, final Object[] parameterTypes, final int argIndex) { final int argCount = parameterTypes.length; assert argIndex >= 0 && argIndex < argCount; final Object argType = parameterTypes[argIndex]; - + if (argIndex < argCount - 1) { final TypeMap<Object, Object> nestedTypeMap = (TypeMap<Object, Object>)typeMap.get(argType); if (nestedTypeMap != null) { @@ -1949,14 +1948,14 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { * @param argIndex */ @SuppressWarnings("unchecked") - private static void findOperations(final TypeMap<Object, Object> typeMap, final Object[] parameterTypes, + private static void findOperations(final TypeMap<Object, Object> typeMap, final Object[] parameterTypes, final Set<Operation> ops, final int argIndex) { final int argCount = parameterTypes.length; assert argIndex >= 0 && argIndex < argCount; final Object argType = parameterTypes[argIndex]; final Set<Object> argTypeKeys = new HashSet<Object>(); typeMap.findAllKeys(argType, argTypeKeys); - + if (argIndex < argCount - 1) { for (final Object argTypeKey : argTypeKeys) { // There are operations defined on the given parameter type so far... @@ -2282,41 +2281,41 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { private void matchAllRecursive(final StackFrame frame, final TimingData timingData) { final List<Rule> rules = getRules(); final Set<Rule> matchedRules = new LinkedHashSet<Rule>(); - + boolean outerMatch; do { outerMatch = false; - + // Match automatic recursive rules matchedRules.clear(); boolean match; MATCHER: - do { - match = false; - for (final Rule rule : rules) { - // Only match rules for which all super-rules have already been matched - if (!matchedRules.contains(rule) && matchedRules.containsAll(rule.getESuperRules())) { - final boolean[] matchResult = rule.matchRecursive(frame); - if (matchResult[1]) { // Guaranteed final match - outerMatch = true; - matchedRules.add(rule); - break MATCHER; - } else if (matchResult[0]) { - match = true; - matchedRules.add(rule); - outerMatch |= !rule.isAbstract(); + do { + match = false; + for (final Rule rule : rules) { + // Only match rules for which all super-rules have already been matched + if (!matchedRules.contains(rule) && matchedRules.containsAll(rule.getESuperRules())) { + final boolean[] matchResult = rule.matchRecursive(frame); + if (matchResult[1]) { // Guaranteed final match + outerMatch = true; + matchedRules.add(rule); + break MATCHER; + } else if (matchResult[0]) { + match = true; + matchedRules.add(rule); + outerMatch |= !rule.isAbstract(); + } } } - } - } while (match); + } while (match); for (final Rule rule : matchedRules) { if (rule.applyFirst(frame)) { break; } } - - } while (outerMatch); + + } while (outerMatch); if (timingData != null) { timingData.finishRecursive(); @@ -2485,28 +2484,28 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { @Override public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { switch (featureID) { - case EmftvmPackage.EXEC_ENV__META_MODELS: - return getMetaModels(); - case EmftvmPackage.EXEC_ENV__INPUT_MODELS: - return getInputModels(); - case EmftvmPackage.EXEC_ENV__INOUT_MODELS: - return getInoutModels(); - case EmftvmPackage.EXEC_ENV__OUTPUT_MODELS: - return getOutputModels(); - case EmftvmPackage.EXEC_ENV__MODULES: - return getModules(); - case EmftvmPackage.EXEC_ENV__MATCHES: - if (resolve) return getMatches(); - return basicGetMatches(); - case EmftvmPackage.EXEC_ENV__TRACES: - if (resolve) return getTraces(); - return basicGetTraces(); - case EmftvmPackage.EXEC_ENV__UNIQUE_RESULTS: - return getUniqueResults(); - case EmftvmPackage.EXEC_ENV__JIT_DISABLED: - return isJitDisabled(); - case EmftvmPackage.EXEC_ENV__CURRENT_PHASE: - return getCurrentPhase(); + case EmftvmPackage.EXEC_ENV__META_MODELS: + return getMetaModels(); + case EmftvmPackage.EXEC_ENV__INPUT_MODELS: + return getInputModels(); + case EmftvmPackage.EXEC_ENV__INOUT_MODELS: + return getInoutModels(); + case EmftvmPackage.EXEC_ENV__OUTPUT_MODELS: + return getOutputModels(); + case EmftvmPackage.EXEC_ENV__MODULES: + return getModules(); + case EmftvmPackage.EXEC_ENV__MATCHES: + if (resolve) return getMatches(); + return basicGetMatches(); + case EmftvmPackage.EXEC_ENV__TRACES: + if (resolve) return getTraces(); + return basicGetTraces(); + case EmftvmPackage.EXEC_ENV__UNIQUE_RESULTS: + return getUniqueResults(); + case EmftvmPackage.EXEC_ENV__JIT_DISABLED: + return isJitDisabled(); + case EmftvmPackage.EXEC_ENV__CURRENT_PHASE: + return getCurrentPhase(); } return super.eGet(featureID, resolve, coreType); } @@ -2519,9 +2518,9 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { @Override public void eSet(final int featureID, final Object newValue) { switch (featureID) { - case EmftvmPackage.EXEC_ENV__JIT_DISABLED: - setJitDisabled((Boolean)newValue); - return; + case EmftvmPackage.EXEC_ENV__JIT_DISABLED: + setJitDisabled((Boolean)newValue); + return; } super.eSet(featureID, newValue); } @@ -2534,9 +2533,9 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { @Override public void eUnset(final int featureID) { switch (featureID) { - case EmftvmPackage.EXEC_ENV__JIT_DISABLED: - setJitDisabled(JIT_DISABLED_EDEFAULT); - return; + case EmftvmPackage.EXEC_ENV__JIT_DISABLED: + setJitDisabled(JIT_DISABLED_EDEFAULT); + return; } super.eUnset(featureID); } @@ -2550,26 +2549,26 @@ public class ExecEnvImpl extends EObjectImpl implements ExecEnv { @Override public boolean eIsSet(final int featureID) { switch (featureID) { - case EmftvmPackage.EXEC_ENV__META_MODELS: - return metaModels != null; - case EmftvmPackage.EXEC_ENV__INPUT_MODELS: - return inputModels != null; - case EmftvmPackage.EXEC_ENV__INOUT_MODELS: - return inoutModels != null; - case EmftvmPackage.EXEC_ENV__OUTPUT_MODELS: - return outputModels != null; - case EmftvmPackage.EXEC_ENV__MODULES: - return modules != null; - case EmftvmPackage.EXEC_ENV__MATCHES: - return matches != null; - case EmftvmPackage.EXEC_ENV__TRACES: - return traces != null; - case EmftvmPackage.EXEC_ENV__UNIQUE_RESULTS: - return uniqueResults != null; - case EmftvmPackage.EXEC_ENV__JIT_DISABLED: - return jitDisabled != JIT_DISABLED_EDEFAULT; - case EmftvmPackage.EXEC_ENV__CURRENT_PHASE: - return currentPhase != CURRENT_PHASE_EDEFAULT; + case EmftvmPackage.EXEC_ENV__META_MODELS: + return metaModels != null; + case EmftvmPackage.EXEC_ENV__INPUT_MODELS: + return inputModels != null; + case EmftvmPackage.EXEC_ENV__INOUT_MODELS: + return inoutModels != null; + case EmftvmPackage.EXEC_ENV__OUTPUT_MODELS: + return outputModels != null; + case EmftvmPackage.EXEC_ENV__MODULES: + return modules != null; + case EmftvmPackage.EXEC_ENV__MATCHES: + return matches != null; + case EmftvmPackage.EXEC_ENV__TRACES: + return traces != null; + case EmftvmPackage.EXEC_ENV__UNIQUE_RESULTS: + return uniqueResults != null; + case EmftvmPackage.EXEC_ENV__JIT_DISABLED: + return jitDisabled != JIT_DISABLED_EDEFAULT; + case EmftvmPackage.EXEC_ENV__CURRENT_PHASE: + return currentPhase != CURRENT_PHASE_EDEFAULT; } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FeatureImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FeatureImpl.java index 7e6d3574..54bb4906 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FeatureImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FeatureImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldImpl.java index 6f7e33e4..c7d4e3eb 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldInstructionImpl.java index de3c7ce0..12c2b424 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldInstructionImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldInstructionImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeImpl.java index 6086fdc2..c50dda02 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeSImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeSImpl.java index 26824689..f7e742e4 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeSImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeSImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetImpl.java index 27f08b2b..eb0a3214 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetStaticImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetStaticImpl.java index a47a52e4..e2be3dd6 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetStaticImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetStaticImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetTransImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetTransImpl.java index 8f3f222c..4165e547 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetTransImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetTransImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetcbImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetcbImpl.java index 9503dccc..1594eeeb 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetcbImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetcbImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvImpl.java index f64c75fd..7aba9f90 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvtypeImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvtypeImpl.java index 0830eed3..d918a775 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvtypeImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvtypeImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GotoImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GotoImpl.java index c36adb12..160161cd 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GotoImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GotoImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfImpl.java index 76687fd4..2bbcaee8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfnImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfnImpl.java index 57679f7e..2341d619 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfnImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfnImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfteImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfteImpl.java index bf28e4e6..f309fe88 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfteImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfteImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ImpliesImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ImpliesImpl.java index 8c57e2d9..626538f5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ImpliesImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ImpliesImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InputRuleElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InputRuleElementImpl.java index 0104a81a..2d545e76 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InputRuleElementImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InputRuleElementImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InsertImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InsertImpl.java index 07ed5011..9b36a554 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InsertImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InsertImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InstructionImpl.java index ae7d0bd9..3f18fe3b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InstructionImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InstructionImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeAllCbsImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeAllCbsImpl.java index 7ed598c8..202eea91 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeAllCbsImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeAllCbsImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbImpl.java index 9ba7201e..25665e6c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbSImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbSImpl.java index 32398647..ef876a45 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbSImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbSImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeImpl.java index 5e6e8835..f2d4c0c5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeInstructionImpl.java index 212af60f..8fb4372a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeInstructionImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeInstructionImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeOperationInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeOperationInstructionImpl.java index 2c2f6471..a1715f38 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeOperationInstructionImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeOperationInstructionImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeStaticImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeStaticImpl.java index 82a9dd4a..fccd1c3f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeStaticImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeStaticImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeSuperImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeSuperImpl.java index a94b6fee..3e585c50 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeSuperImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeSuperImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IsnullImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IsnullImpl.java index e2e992fa..89c19aec 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IsnullImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IsnullImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IterateImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IterateImpl.java index 4a4f959f..f91b5738 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IterateImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IterateImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LineNumberImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LineNumberImpl.java index bf90dd27..ea56becc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LineNumberImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LineNumberImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LoadImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LoadImpl.java index 6e236fe3..ebee1acc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LoadImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LoadImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableImpl.java index 9080b42c..5dc84be1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableInstructionImpl.java index 8d0776e2..620cff9d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableInstructionImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableInstructionImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchImpl.java index 6d63483e..293f55e5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchSImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchSImpl.java index 8d165794..ef0dc5c1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchSImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchSImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MetamodelImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MetamodelImpl.java index a01d5827..fba86cb2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MetamodelImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MetamodelImpl.java @@ -1,9 +1,10 @@ /******************************************************************************* - * Copyright (c) 2011 Vrije Universiteit Brussel. + * Copyright (c) 2011-2012 Vrije Universiteit Brussel. + * Copyright (c) 2013-2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -78,7 +79,7 @@ public class MetamodelImpl extends ModelImpl implements Metamodel { * {@inheritDoc} * <!-- end-user-doc --> */ - public synchronized EClassifier findType(String typeName) { + public synchronized EClassifier findType(final String typeName) { if (types == null) { types = createTypeTable(ambiguousTypes); } @@ -113,10 +114,10 @@ public class MetamodelImpl extends ModelImpl implements Metamodel { * @param ignore the set of objects to ignore * @param ambiguousTypes the set of ambiguous type names (more than one occurrence) */ - private static void registerTypeChain( - final Map<String, EClassifier> types, + public static void registerTypeChain( + final Map<String, EClassifier> types, final Resource res, - final String ns, + final String ns, final Set<Object> ignore, final Set<String> ambiguousTypes) { if (res != null && !ignore.contains(res)) { @@ -134,12 +135,12 @@ public class MetamodelImpl extends ModelImpl implements Metamodel { * @param ambiguousTypes the set of ambiguous type names (more than one occurrence) */ private static void registerTypeChain( - final Map<String, EClassifier> types, + final Map<String, EClassifier> types, final EList<? extends EObject> objects, - final String ns, + final String ns, final Set<Object> ignore, final Set<String> ambiguousTypes) { - for (EObject o : objects) { + for (final EObject o : objects) { switch (o.eClass().getClassifierID()) { case EcorePackage.EPACKAGE: String pname = ((EPackage)o).getName(); @@ -148,7 +149,7 @@ public class MetamodelImpl extends ModelImpl implements Metamodel { } registerTypeChain(types, o.eContents(), pname, ignore, ambiguousTypes); break; - // Fix for bug # 423597: switch on all concrete EClassifier sub-types + // Fix for bug # 423597: switch on all concrete EClassifier sub-types case EcorePackage.EDATA_TYPE: case EcorePackage.EENUM: case EcorePackage.ECLASS: @@ -173,9 +174,9 @@ public class MetamodelImpl extends ModelImpl implements Metamodel { * @param ambiguousTypes the set of ambiguous type names (more than one occurrence) */ private static void registerTypeChain( - final Map<String, EClassifier> types, + final Map<String, EClassifier> types, final EClassifier type, - final String ns, + final String ns, final Set<Object> ignore, final Set<String> ambiguousTypes) { if (ignore.contains(type)) { @@ -186,25 +187,25 @@ public class MetamodelImpl extends ModelImpl implements Metamodel { registerSingleType(types, type.getName(), type, ambiguousTypes); if (type instanceof EClass) { final EClass cls = (EClass)type; - for (EStructuralFeature sf : cls.getEStructuralFeatures()) { - EClassifier eType = sf.getEType(); + for (final EStructuralFeature sf : cls.getEStructuralFeatures()) { + final EClassifier eType = sf.getEType(); if (eType != null) { registerTypeChain(types, eType.eResource(), null, ignore, ambiguousTypes); } } - for (EOperation op : cls.getEOperations()) { + for (final EOperation op : cls.getEOperations()) { EClassifier eType = op.getEType(); if (eType != null) { registerTypeChain(types, eType.eResource(), null, ignore, ambiguousTypes); } - for (EParameter p : op.getEParameters()) { + for (final EParameter p : op.getEParameters()) { eType = p.getEType(); if (eType != null) { registerTypeChain(types, eType.eResource(), null, ignore, ambiguousTypes); } } } - for (EClass superCls : cls.getESuperTypes()) { + for (final EClass superCls : cls.getESuperTypes()) { registerTypeChain(types, superCls.eResource(), null, ignore, ambiguousTypes); } } @@ -218,7 +219,7 @@ public class MetamodelImpl extends ModelImpl implements Metamodel { * @param ambiguousTypes the set of ambiguous type names (more than one occurrence) */ private static void registerSingleType( - final Map<String, EClassifier> types, + final Map<String, EClassifier> types, final String typeName, final EClassifier type, final Set<String> ambiguousTypes) { diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelDeclarationImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelDeclarationImpl.java index dee08ad5..3b83f6a6 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelDeclarationImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelDeclarationImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelFactoryImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelFactoryImpl.java new file mode 100644 index 00000000..dca85bde --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelFactoryImpl.java @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * 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: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.impl; + +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.m2m.atl.emftvm.EmftvmFactory; +import org.eclipse.m2m.atl.emftvm.Metamodel; +import org.eclipse.m2m.atl.emftvm.Model; +import org.eclipse.m2m.atl.emftvm.ModelFactory; + +/** + * Default implementation for {@link ModelFactory}. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class ModelFactoryImpl implements ModelFactory { + + /** + * {@inheritDoc} + */ + public Model createModel(final Resource resource) { + final Model model = EmftvmFactory.eINSTANCE.createModel(); + model.setResource(resource); + return model; + } + + /** + * {@inheritDoc} + */ + public Metamodel createMetamodel(final Resource resource) { + final Metamodel metaModel = EmftvmFactory.eINSTANCE.createMetamodel(); + metaModel.setResource(resource); + return metaModel; + } + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelImpl.java index 00bfac49..55f82db8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelImpl.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. + * Copyright (c) 2012, 2013, 2018, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -75,10 +76,12 @@ public class ModelImpl extends EObjectImpl implements Model { */ @Override public boolean hasNext() { - if (i < cache.size()) { - return true; - } else if (dataSource == null) { - return false; + synchronized (cache) { + if (i < cache.size()) { + return true; + } else if (dataSource == null) { + return false; + } } if (!nextSet && inner.hasNext()) { next = inner.next(); // support null values for next @@ -109,12 +112,7 @@ public class ModelImpl extends EObjectImpl implements Model { next = inner.next(); } assert !nextSet && type.isInstance(next); - if (++i > cache.size()) { - assert dataSource != null; // cache not complete - cache.add(next); - } else { - assert cache.contains(next); - } + updateCache(next); return next; } } @@ -126,7 +124,7 @@ public class ModelImpl extends EObjectImpl implements Model { * @param dataSource * @param type the type of which to return the instances */ - public InstanceOfList(Iterable<EObject> dataSource, EClass type) { + public InstanceOfList(final Iterable<EObject> dataSource, final EClass type) { super(dataSource); this.type = type; } @@ -146,7 +144,7 @@ public class ModelImpl extends EObjectImpl implements Model { * {@inheritDoc} */ @Override - public boolean remove(Object o) { + public boolean remove(final Object o) { // try to remove from cache - if not contained, nothing needs to be done return cache.remove(o); } @@ -155,7 +153,7 @@ public class ModelImpl extends EObjectImpl implements Model { * {@inheritDoc} */ @Override - public boolean add(EObject o) { + public boolean add(final EObject o) { // add to cache only if complete - if not contained, it will show up on the next iteration synchronized (cache) { if (dataSource == null) { // cache complete @@ -215,7 +213,7 @@ public class ModelImpl extends EObjectImpl implements Model { /** * Cache of allInstancesOf(). */ - protected Map<EClass, InstanceOfList> allInstancesMap = new HashMap<EClass, InstanceOfList>(); + protected final Map<EClass, LazyList<EObject>> allInstancesMap = new HashMap<EClass, LazyList<EObject>>(); /** * <!-- begin-user-doc --> @@ -255,8 +253,8 @@ public class ModelImpl extends EObjectImpl implements Model { * <!-- end-user-doc --> * @generated */ - public void setResource(Resource newResource) { - Resource oldResource = resource; + public void setResource(final Resource newResource) { + final Resource oldResource = resource; resource = newResource; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, EmftvmPackage.MODEL__RESOURCE, oldResource, resource)); @@ -278,8 +276,8 @@ public class ModelImpl extends EObjectImpl implements Model { * <!-- end-user-doc --> * @generated */ - public void setAllowInterModelReferences(boolean newAllowInterModelReferences) { - boolean oldAllowInterModelReferences = allowInterModelReferences; + public void setAllowInterModelReferences(final boolean newAllowInterModelReferences) { + final boolean oldAllowInterModelReferences = allowInterModelReferences; allowInterModelReferences = newAllowInterModelReferences; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, EmftvmPackage.MODEL__ALLOW_INTER_MODEL_REFERENCES, oldAllowInterModelReferences, allowInterModelReferences)); @@ -313,7 +311,7 @@ public class ModelImpl extends EObjectImpl implements Model { /** * Adds <code>element</code> to the "allInstances" list for the given type and all its supertypes. - * + * * @param element * the element to add * @param type @@ -323,7 +321,7 @@ public class ModelImpl extends EObjectImpl implements Model { if (allInstancesMap.containsKey(type)) { allInstancesMap.get(type).add(element); } - for (EClass superType : type.getESuperTypes()) { + for (final EClass superType : type.getESuperTypes()) { addElement(element, superType); } } @@ -339,17 +337,17 @@ public class ModelImpl extends EObjectImpl implements Model { if (!resContents.remove(element)) { throw new IllegalArgumentException(String.format("Element %s not contained as a root element in this model", element)); } - for (EObject child : new ArrayList<EObject>(element.eContents())) { + for (final EObject child : new ArrayList<EObject>(element.eContents())) { assert child.eResource() == null; // adding children to a container removes them from their previous container - resContents.add(child); + resContents.add(child); } deleteElement(element, element.eClass()); } /** * Deletes <code>element</code> from the "allInstances" list for the given type and all its supertypes. - * + * * @param element * the element to delete * @param type @@ -359,7 +357,7 @@ public class ModelImpl extends EObjectImpl implements Model { if (allInstancesMap.containsKey(type)) { allInstancesMap.get(type).remove(element); } - for (EClass superType : type.getESuperTypes()) { + for (final EClass superType : type.getESuperTypes()) { deleteElement(element, superType); } } @@ -371,12 +369,12 @@ public class ModelImpl extends EObjectImpl implements Model { * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { + public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { switch (featureID) { - case EmftvmPackage.MODEL__RESOURCE: - return getResource(); - case EmftvmPackage.MODEL__ALLOW_INTER_MODEL_REFERENCES: - return isAllowInterModelReferences(); + case EmftvmPackage.MODEL__RESOURCE: + return getResource(); + case EmftvmPackage.MODEL__ALLOW_INTER_MODEL_REFERENCES: + return isAllowInterModelReferences(); } return super.eGet(featureID, resolve, coreType); } @@ -388,14 +386,14 @@ public class ModelImpl extends EObjectImpl implements Model { * @generated */ @Override - public void eSet(int featureID, Object newValue) { + public void eSet(final int featureID, final Object newValue) { switch (featureID) { - case EmftvmPackage.MODEL__RESOURCE: - setResource((Resource)newValue); - return; - case EmftvmPackage.MODEL__ALLOW_INTER_MODEL_REFERENCES: - setAllowInterModelReferences((Boolean)newValue); - return; + case EmftvmPackage.MODEL__RESOURCE: + setResource((Resource)newValue); + return; + case EmftvmPackage.MODEL__ALLOW_INTER_MODEL_REFERENCES: + setAllowInterModelReferences((Boolean)newValue); + return; } super.eSet(featureID, newValue); } @@ -407,14 +405,14 @@ public class ModelImpl extends EObjectImpl implements Model { * @generated */ @Override - public void eUnset(int featureID) { + public void eUnset(final int featureID) { switch (featureID) { - case EmftvmPackage.MODEL__RESOURCE: - setResource(RESOURCE_EDEFAULT); - return; - case EmftvmPackage.MODEL__ALLOW_INTER_MODEL_REFERENCES: - setAllowInterModelReferences(ALLOW_INTER_MODEL_REFERENCES_EDEFAULT); - return; + case EmftvmPackage.MODEL__RESOURCE: + setResource(RESOURCE_EDEFAULT); + return; + case EmftvmPackage.MODEL__ALLOW_INTER_MODEL_REFERENCES: + setAllowInterModelReferences(ALLOW_INTER_MODEL_REFERENCES_EDEFAULT); + return; } super.eUnset(featureID); } @@ -426,12 +424,12 @@ public class ModelImpl extends EObjectImpl implements Model { * @generated */ @Override - public boolean eIsSet(int featureID) { + public boolean eIsSet(final int featureID) { switch (featureID) { - case EmftvmPackage.MODEL__RESOURCE: - return RESOURCE_EDEFAULT == null ? resource != null : !RESOURCE_EDEFAULT.equals(resource); - case EmftvmPackage.MODEL__ALLOW_INTER_MODEL_REFERENCES: - return allowInterModelReferences != ALLOW_INTER_MODEL_REFERENCES_EDEFAULT; + case EmftvmPackage.MODEL__RESOURCE: + return RESOURCE_EDEFAULT == null ? resource != null : !RESOURCE_EDEFAULT.equals(resource); + case EmftvmPackage.MODEL__ALLOW_INTER_MODEL_REFERENCES: + return allowInterModelReferences != ALLOW_INTER_MODEL_REFERENCES_EDEFAULT; } return super.eIsSet(featureID); } @@ -446,7 +444,7 @@ public class ModelImpl extends EObjectImpl implements Model { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + final StringBuffer result = new StringBuffer(super.toString()); result.append(" (resource: "); result.append(resource.getURI() == null ? resource : resource.getURI()); result.append(')'); diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModuleImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModuleImpl.java index a6b00b59..8a1791bc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModuleImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModuleImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NamedElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NamedElementImpl.java index 2fb02081..b2d70ab1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NamedElementImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NamedElementImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewImpl.java index 5a306018..2af6c389 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewSImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewSImpl.java index 217d7174..11737a54 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewSImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewSImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NotImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NotImpl.java index 47a092ae..70c18a3a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NotImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NotImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OperationImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OperationImpl.java index 15d4e315..85263ef3 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OperationImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OperationImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OrImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OrImpl.java index ec5ba5cb..f1a875bd 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OrImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OrImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OutputRuleElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OutputRuleElementImpl.java index 706db739..4b1ddae8 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OutputRuleElementImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OutputRuleElementImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ParameterImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ParameterImpl.java index 02e64c40..41dc9dd1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ParameterImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ParameterImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PopImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PopImpl.java index f05d3e85..ef10ea21 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PopImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PopImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushImpl.java index fc2d1ad2..f43bfaed 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushfImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushfImpl.java index 18ae92a6..ca8e02eb 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushfImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushfImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushtImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushtImpl.java index cf930161..5980af61 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushtImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushtImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RemoveImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RemoveImpl.java index 85c1f8cf..4b1117ac 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RemoveImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RemoveImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ReturnImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ReturnImpl.java index 203220ab..2f584299 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ReturnImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ReturnImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleElementImpl.java index f1ee792d..9aa8365c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleElementImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleElementImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleImpl.java index b4adad8d..6df005bd 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2011 Vrije Universiteit Brussel. * Copyright (c) 2017-2018 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetImpl.java index 52a40d7d..8b54240c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetStaticImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetStaticImpl.java index 90edab13..10632e50 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetStaticImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetStaticImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/StoreImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/StoreImpl.java index d642db01..796dd32b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/StoreImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/StoreImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapImpl.java index 27f426f2..7abe9a84 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapX1Impl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapX1Impl.java index 370bdf7d..88151c2f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapX1Impl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapX1Impl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/TypedElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/TypedElementImpl.java index ada09bd8..8072f9b7 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/TypedElementImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/TypedElementImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/XorImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/XorImpl.java index de15cc81..0f19fbb5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/XorImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/XorImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/ConstantPool.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/ConstantPool.java index 98781783..80a04ec1 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/ConstantPool.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/ConstantPool.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/EMFTVMResourceFactoryImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/EMFTVMResourceFactoryImpl.java index fc4a35dc..0c870d4b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/EMFTVMResourceFactoryImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/EMFTVMResourceFactoryImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/EMFTVMResourceImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/EMFTVMResourceImpl.java index 071d7696..f91991dc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/EMFTVMResourceImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/EMFTVMResourceImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/LoadInstructionParametersSwitch.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/LoadInstructionParametersSwitch.java index 1244cb48..cff334c5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/LoadInstructionParametersSwitch.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/LoadInstructionParametersSwitch.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/SaveInstructionParametersSwitch.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/SaveInstructionParametersSwitch.java index 8316777c..d44b4dec 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/SaveInstructionParametersSwitch.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/resource/SaveInstructionParametersSwitch.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/ByteCodeSwitch.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/ByteCodeSwitch.java index a8ca44a2..f737a55e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/ByteCodeSwitch.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/ByteCodeSwitch.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2014 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/CodeBlockJIT.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/CodeBlockJIT.java index a0afebc3..e786bf0e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/CodeBlockJIT.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/CodeBlockJIT.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2014 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/JITCodeBlock.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/JITCodeBlock.java index d0388563..b4730f45 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/JITCodeBlock.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/JITCodeBlock.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2014 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/LabelSwitch.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/LabelSwitch.java index 009177dc..9fbfa89f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/LabelSwitch.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/jit/LabelSwitch.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/launcher/compat/EMFTVMLauncher.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/launcher/compat/EMFTVMLauncher.java index aba3b72a..77e88dc5 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/launcher/compat/EMFTVMLauncher.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/launcher/compat/EMFTVMLauncher.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2017 Dennis Wagelaar. + * Copyright (c) 2017, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * Dennis Wagelaar - initial API and implementation *******************************************************************************/ @@ -51,7 +51,7 @@ import org.eclipse.m2m.atl.emftvm.util.VMMonitor; /** * The EMFVM implementation of the {@link ILauncher} interface. - * + * * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class EMFTVMLauncher implements ILauncher { @@ -84,7 +84,7 @@ public class EMFTVMLauncher implements ILauncher { /** * Adds any model to the local map. - * + * * @param model * the {@link IModel} * @param name @@ -93,7 +93,7 @@ public class EMFTVMLauncher implements ILauncher { * the model reference model name * @return the EMFTVM {@link Model} */ - protected Model addModel(IModel model, String name, String referenceModelName) { + protected Model addModel(final IModel model, final String name, final String referenceModelName) { final Model emftvmModel; if (models.containsKey(name)) { ATLLogger.warning(Messages.getString("EMFTVMLauncher.MODEL_REGISTERED", name)); //$NON-NLS-1$ @@ -106,18 +106,17 @@ public class EMFTVMLauncher implements ILauncher { final EMFInjector emfInjector; try { emfInjector = (EMFInjector) CoreService.getInjector(MODEL_FACTORY_NAME); - } catch (ATLCoreException e) { + } catch (final ATLCoreException e) { throw new VMException(null, e.getLocalizedMessage(), e); } emfInjector.inject(emfModel, outputResourceSet.createResource(URI.createURI(name + ".xmi"))); //$NON-NLS-1$ } - emftvmModel = EmftvmFactory.eINSTANCE.createModel(); - emftvmModel.setResource(emfModel.getResource()); + emftvmModel = EmftvmFactory.eINSTANCE.createModel(emfModel.getResource()); } if (!models.containsKey(referenceModelName)) { models.put(referenceModelName, model.getReferenceModel()); - final Metamodel metamodel = EmftvmFactory.eINSTANCE.createMetamodel(); - metamodel.setResource(((EMFReferenceModel) model.getReferenceModel()).getResource()); + final Metamodel metamodel = EmftvmFactory.eINSTANCE + .createMetamodel(((EMFReferenceModel) model.getReferenceModel()).getResource()); execEnv.registerMetaModel(referenceModelName, metamodel); } return emftvmModel; @@ -125,11 +124,11 @@ public class EMFTVMLauncher implements ILauncher { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#addInModel(org.eclipse.m2m.atl.core.IModel, * java.lang.String, java.lang.String) */ - public void addInModel(IModel model, String name, String referenceModelName) { + public void addInModel(final IModel model, final String name, final String referenceModelName) { model.setIsTarget(false); final Model emftvmModel = addModel(model, name, referenceModelName); if (emftvmModel != null) { @@ -139,11 +138,11 @@ public class EMFTVMLauncher implements ILauncher { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#addInOutModel(org.eclipse.m2m.atl.core.IModel, * java.lang.String, java.lang.String) */ - public void addInOutModel(IModel model, String name, String referenceModelName) { + public void addInOutModel(final IModel model, final String name, final String referenceModelName) { model.setIsTarget(true); final Model emftvmModel = addModel(model, name, referenceModelName); if (emftvmModel != null) { @@ -153,11 +152,11 @@ public class EMFTVMLauncher implements ILauncher { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#addOutModel(org.eclipse.m2m.atl.core.IModel, * java.lang.String, java.lang.String) */ - public void addOutModel(IModel model, String name, String referenceModelName) { + public void addOutModel(final IModel model, final String name, final String referenceModelName) { model.setIsTarget(true); final Model emftvmModel = addModel(model, name, referenceModelName); if (emftvmModel != null) { @@ -167,11 +166,11 @@ public class EMFTVMLauncher implements ILauncher { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#addLibrary(java.lang.String, * java.lang.Object) */ - public void addLibrary(String name, Object library) { + public void addLibrary(final String name, final Object library) { if (libraries.containsKey(name)) { ATLLogger.warning(Messages.getString("EMFTVMLauncher.LIBRARY_REGISTERED", name)); //$NON-NLS-1$ } else { @@ -181,10 +180,10 @@ public class EMFTVMLauncher implements ILauncher { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#initialize(java.util.Map) */ - public void initialize(Map<String, Object> parameters) { + public void initialize(final Map<String, Object> parameters) { models = new HashMap<String, IModel>(); libraries = new HashMap<String, Module>(); moduleResourceSet = new ResourceSetImpl(); @@ -196,7 +195,7 @@ public class EMFTVMLauncher implements ILauncher { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#launch(java.lang.String, * org.eclipse.core.runtime.IProgressMonitor, java.util.Map, * java.lang.Object[]) @@ -208,7 +207,7 @@ public class EMFTVMLauncher implements ILauncher { /** * Launches the transformation with preloaded modules. - * + * * @param tool * the execution tool * @param monitor @@ -220,13 +219,13 @@ public class EMFTVMLauncher implements ILauncher { * @return the execution result */ protected Object internalLaunch(final VMMonitor tool, final IProgressMonitor monitor, - final Map<String, Object> options, Object... modules) { + final Map<String, Object> options, final Object... modules) { getModuleFromObject(modules[0]); for (int i = 1; i < modules.length; i++) { getModuleFromObject(modules[i]); } - for (Model model : LazyCollections.asLazySet(execEnv.getInoutModels().values()) + for (final Model model : LazyCollections.asLazySet(execEnv.getInoutModels().values()) .union(LazyCollections.asLazySet(execEnv.getOutputModels().values()))) { model.setAllowInterModelReferences( LauncherService.getBooleanOption(options.get("allowInterModelReferences"), false)); //$NON-NLS-1$ @@ -235,7 +234,7 @@ public class EMFTVMLauncher implements ILauncher { execEnv.setMonitor(tool); execEnv.setJitDisabled(LauncherService.getBooleanOption(options.get("jitDisabled"), false)); //$NON-NLS-1$ timingData.finishLoading(); - + final Object result = execEnv.run(timingData); timingData.finish(); @@ -247,7 +246,7 @@ public class EMFTVMLauncher implements ILauncher { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#loadModule(java.io.InputStream) */ public Module loadModule(final InputStream inputStream) { @@ -261,19 +260,19 @@ public class EMFTVMLauncher implements ILauncher { resource.setURI(URI.createURI(EMF_URI_PREFIX + path + DefaultModuleResolver.FILE_EXT)); execEnv.loadModule(moduleResolver, module.getName()); return module; - } catch (IOException e) { + } catch (final IOException e) { throw new VMException(null, e.getLocalizedMessage(), e); } } /** * Load a module if necessary. - * + * * @param module * the given {@link Module} or {@link InputStream}. * @return the {@link Module} */ - protected Module getModuleFromObject(Object module) { + protected Module getModuleFromObject(final Object module) { if (module instanceof InputStream) { return loadModule((InputStream) module); } else if (module instanceof Module) { @@ -284,24 +283,24 @@ public class EMFTVMLauncher implements ILauncher { /** * Finds the first module in {@link Resource} - * + * * <pre> * r * </pre> - * + * * . - * + * * @param r * @return the module with the given name inside - * + * * <pre> * r * </pre> - * + * * , or <code>null</code> */ private Module findModule(final Resource r) throws ModuleNotFoundException { - for (EObject o : r.getContents()) { + for (final EObject o : r.getContents()) { if (o instanceof Module) { return (Module) o; } @@ -311,25 +310,25 @@ public class EMFTVMLauncher implements ILauncher { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#getModel(java.lang.String) */ - public IModel getModel(String modelName) { + public IModel getModel(final String modelName) { return models.get(modelName); } /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#getLibrary(java.lang.String) */ - public Object getLibrary(String libraryName) { + public Object getLibrary(final String libraryName) { return libraries.get(libraryName); } /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#getDefaultModelFactoryName() */ public String getDefaultModelFactoryName() { @@ -338,7 +337,7 @@ public class EMFTVMLauncher implements ILauncher { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.core.launch.ILauncher#getModes() */ public String[] getModes() { diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/messages.properties b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/messages.properties index 5eef175f..c698637d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/messages.properties +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2017 Dennis Wagelaar. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Dennis Wagelaar diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/profiler/Profiler.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/profiler/Profiler.java index 156e1790..3ef17a1d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/profiler/Profiler.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/profiler/Profiler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2014 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/profiler/StopWatch.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/profiler/StopWatch.java index 91e8d48d..36cb361a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/profiler/StopWatch.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/profiler/StopWatch.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2014 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ClassModuleResolver.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ClassModuleResolver.java index b7c6ff36..1b873b0a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ClassModuleResolver.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ClassModuleResolver.java @@ -1,9 +1,9 @@ /*******************************************************************************
* Copyright (c) 2013 HealthConnect CVBA.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Dennis Wagelaar, HealthConnect - initial API and
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DefaultModuleResolver.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DefaultModuleResolver.java index 43ae2830..8721aa1a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DefaultModuleResolver.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DefaultModuleResolver.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DefaultModuleResolverFactory.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DefaultModuleResolverFactory.java index 1bbb2e0c..6e80da50 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DefaultModuleResolverFactory.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DefaultModuleResolverFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DuplicateEntryException.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DuplicateEntryException.java index a6141971..a4f57fea 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DuplicateEntryException.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/DuplicateEntryException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EMFTVMUtil.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EMFTVMUtil.java index cfdbb110..ee87d083 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EMFTVMUtil.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EMFTVMUtil.java @@ -1,9 +1,10 @@ /******************************************************************************* - * Copyright (c) 2011-2018 Dennis Wagelaar, Vrije Universiteit Brussel. + * Copyright (c) 2011, 2012 Vrije Universiteit Brussel. + * Copyright (c) 2012-2019, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -36,6 +37,7 @@ import java.util.StringTokenizer; import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.logging.Level; import java.util.regex.Pattern; import org.eclipse.emf.common.util.EList; @@ -85,7 +87,7 @@ public final class EMFTVMUtil { * {@inheritDoc} */ @Override - public Object defaultCase(EObject object) { + public Object defaultCase(final EObject object) { throw new IllegalArgumentException("Unsupported type: " + object); } @@ -93,7 +95,7 @@ public final class EMFTVMUtil { * {@inheritDoc} */ @Override - public Object caseEClass(EClass object) { + public Object caseEClass(final EClass object) { return object; } @@ -101,7 +103,7 @@ public final class EMFTVMUtil { * {@inheritDoc} */ @Override - public Object caseEClassifier(EClassifier object) { + public Object caseEClassifier(final EClassifier object) { final Class<?> ic = object.getInstanceClass(); if (ic == null) { throw new IllegalArgumentException(String.format("Primitive EMF type without instance class %s", object)); @@ -113,7 +115,7 @@ public final class EMFTVMUtil { * {@inheritDoc} */ @Override - public Object caseEEnum(EEnum object) { + public Object caseEEnum(final EEnum object) { return EnumLiteral.class; } @@ -278,8 +280,7 @@ public final class EMFTVMUtil { */ public static synchronized Metamodel getEcoreMetamodel() { if (ecoreMetamodel == null) { - ecoreMetamodel = EmftvmFactory.eINSTANCE.createMetamodel(); - ecoreMetamodel.setResource(EcorePackage.eINSTANCE.eResource()); + ecoreMetamodel = EmftvmFactory.eINSTANCE.createMetamodel(EcorePackage.eINSTANCE.eResource()); } return ecoreMetamodel; } @@ -291,8 +292,7 @@ public final class EMFTVMUtil { */ public static synchronized Metamodel getEmfTvmMetamodel() { if (emfTvmMetamodel == null) { - emfTvmMetamodel = EmftvmFactory.eINSTANCE.createMetamodel(); - emfTvmMetamodel.setResource(EmftvmPackage.eINSTANCE.eResource()); + emfTvmMetamodel = EmftvmFactory.eINSTANCE.createMetamodel(EmftvmPackage.eINSTANCE.eResource()); } return emfTvmMetamodel; } @@ -304,8 +304,7 @@ public final class EMFTVMUtil { */ public static synchronized Metamodel getTraceMetamodel() { if (traceMetamodel == null) { - traceMetamodel = EmftvmFactory.eINSTANCE.createMetamodel(); - traceMetamodel.setResource(TracePackage.eINSTANCE.eResource()); + traceMetamodel = EmftvmFactory.eINSTANCE.createMetamodel(TracePackage.eINSTANCE.eResource()); } return traceMetamodel; } @@ -347,6 +346,9 @@ public final class EMFTVMUtil { model = env.getInoutModels().get(modelname); } if (model == null) { + model = env.getMetaModels().get(modelname); + } + if (model == null) { throw new IllegalArgumentException(String.format("No input/inout model found with name %s", modelname)); } return model.allInstancesOf(type); @@ -881,8 +883,8 @@ public final class EMFTVMUtil { final String message = v == null ? String.format("Cannot add/remove OclUndefined to/from multi-valued field %s::%s", ref.getEContainingClass().getName(), ref.getName()) - : String.format("Cannot add/remove values of type %s to/from multi-valued field %s::%s", - getTypeName(env, v.getClass()), ref.getEContainingClass().getName(), ref.getName()); + : String.format("Cannot add/remove values of type %s to/from multi-valued field %s::%s", + getTypeName(env, v.getClass()), ref.getEContainingClass().getName(), ref.getName()); throw new IllegalArgumentException(message); } } @@ -2217,11 +2219,15 @@ public final class EMFTVMUtil { return new File(wsPath); } } catch (final InstantiationException e) { - ATLLogger.fine(e.getMessage()); + ATLLogger.log(Level.FINE, e.getMessage(), e); } catch (final IllegalAccessException e) { - ATLLogger.fine(e.getMessage()); + ATLLogger.log(Level.FINE, e.getMessage(), e); } catch (final ClassNotFoundException e) { - ATLLogger.fine(e.getMessage()); + ATLLogger.log(Level.FINE, e.getMessage(), e); + } catch (final SecurityException e) { + ATLLogger.log(Level.FINE, e.getMessage(), e); + } catch (final NoClassDefFoundError e) { + ATLLogger.log(Level.FINE, e.getMessage(), e); } ATLLogger.info("Could not find workspace root; falling back to native java.io.File path resolution"); return new File(path); diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EmftvmAdapterFactory.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EmftvmAdapterFactory.java index a4a44366..f9c5a292 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EmftvmAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EmftvmAdapterFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EmftvmSwitch.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EmftvmSwitch.java index 0d9ca267..8904a261 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EmftvmSwitch.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EmftvmSwitch.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionList.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionList.java index 298cb584..599823ee 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionList.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionList.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2013 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionListOnList.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionListOnList.java index 713e3636..de8574f7 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionListOnList.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionListOnList.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2013 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionSetOnSet.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionSetOnSet.java index f0dc5cb2..42cfefd0 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionSetOnSet.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumConversionSetOnSet.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2013 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumLiteral.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumLiteral.java index 591eb306..bca00910 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumLiteral.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EnumLiteral.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2013 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ExecEnvPool.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ExecEnvPool.java index a14a2e0c..e1ba9a87 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ExecEnvPool.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ExecEnvPool.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/FieldContainer.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/FieldContainer.java index 8ddcede4..22f9ceac 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/FieldContainer.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/FieldContainer.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -28,14 +28,14 @@ public final class FieldContainer { /** * Lookup table for fields: (name -> (context -> field)). */ - protected final Map<String, TypeMap<Object, Field>> fields = - new HashMap<String, TypeMap<Object,Field>>(); + protected final Map<String, TypeMap<Object, Field>> fields = + new HashMap<String, TypeMap<Object,Field>>(); /** * Lookup table for static fields: (name -> (context -> field)). */ - protected final Map<String, TypeMap<Object, Field>> staticFields = - new HashMap<String, TypeMap<Object,Field>>(); + protected final Map<String, TypeMap<Object, Field>> staticFields = + new HashMap<String, TypeMap<Object,Field>>(); /** * Set of all fields (for clearing values). @@ -92,8 +92,6 @@ public final class FieldContainer { if (ctxKey != null) { f = fieldreg.get(ctxKey); assert f != null; - // Now register directly under context type - fieldreg.put(context, f); } } return f; @@ -120,7 +118,7 @@ public final class FieldContainer { * @return the corresponding field, or <code>null</code> if not found * @throws DuplicateEntryException if there is a field conflict */ - public Field findStaticField(Object context, String name) throws DuplicateEntryException { + public Field findStaticField(final Object context, final String name) throws DuplicateEntryException { final TypeMap<Object, Field> fieldreg = staticFields.get(name); if (fieldreg != null) { // Static fields must be defined in exact context type @@ -145,7 +143,7 @@ public final class FieldContainer { * Clears the values of all registered fields. */ public void clear() { - for (Field f : allFields) { + for (final Field f : allFields) { f.clear(); } } diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyBag.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyBag.java index 926741f4..781100a3 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyBag.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyBag.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. + * Copyright (c) 2023 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -53,8 +54,8 @@ public class LazyBag<E> extends LazyCollection<E> { * {@inheritDoc} */ @Override - public boolean contains(Object o) { - return (object == null ? o == null : object.equals(o)) || + public boolean contains(final Object o) { + return (object == null ? o == null : object.equals(o)) || ((Collection<E>)dataSource).contains(o); } @@ -62,9 +63,9 @@ public class LazyBag<E> extends LazyCollection<E> { * {@inheritDoc} */ @Override - public int count(Object o) { - return (object == null ? o == null : object.equals(o)) ? 1 : 0 + - ((LazyCollection<E>)dataSource).count(o); + public int count(final Object o) { + return ((object == null ? o == null : object.equals(o)) ? 1 : 0) + + ((LazyCollection<E>) dataSource).count(o); } /** @@ -114,7 +115,7 @@ public class LazyBag<E> extends LazyCollection<E> { * {@inheritDoc} */ @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { return ((Collection<E>)dataSource).contains(o) || other.contains(o); } @@ -122,7 +123,7 @@ public class LazyBag<E> extends LazyCollection<E> { * {@inheritDoc} */ @Override - public int count(Object object) { + public int count(final Object object) { return ((LazyCollection<E>)dataSource).count(object) + other.count(object); } @@ -154,7 +155,7 @@ public class LazyBag<E> extends LazyCollection<E> { /** * {@link LazyBag} that represents a range running from a first to last {@link Integer}. - * + * * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public static class IntegerRangeBag extends LazyBag<Integer> { @@ -164,7 +165,7 @@ public class LazyBag<E> extends LazyCollection<E> { /** * Creates a new {@link IntegerRangeBag}. - * + * * @param first * the first object of the range to include * @param last @@ -192,7 +193,7 @@ public class LazyBag<E> extends LazyCollection<E> { * {@inheritDoc} */ @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { if (o instanceof Integer) { final Integer obj = (Integer) o; return (obj >= first && obj <= last); @@ -204,7 +205,7 @@ public class LazyBag<E> extends LazyCollection<E> { * {@inheritDoc} */ @Override - public int count(Object object) { + public int count(final Object object) { // All elements of a range are unique return contains(object) ? 1 : 0; } @@ -238,7 +239,7 @@ public class LazyBag<E> extends LazyCollection<E> { /** * {@link LazyBag} that represents a range running from a first to last {@link Long}. - * + * * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public static class LongRangeBag extends LazyBag<Long> { @@ -248,7 +249,7 @@ public class LazyBag<E> extends LazyCollection<E> { /** * Creates a new {@link LongRangeBag}. - * + * * @param first * the first object of the range to include * @param last @@ -276,7 +277,7 @@ public class LazyBag<E> extends LazyCollection<E> { * {@inheritDoc} */ @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { if (o instanceof Long) { final Long obj = (Long) o; return (obj >= first && obj <= last); @@ -288,7 +289,7 @@ public class LazyBag<E> extends LazyCollection<E> { * {@inheritDoc} */ @Override - public int count(Object object) { + public int count(final Object object) { // All elements of a range are unique return contains(object) ? 1 : 0; } @@ -343,7 +344,7 @@ public class LazyBag<E> extends LazyCollection<E> { sOcc = new HashMap<E, Integer>(s.occurrences); } else { sOcc = new HashMap<E, Integer>(); - for (E e : s) { + for (final E e : s) { if (sOcc.containsKey(e)) { sOcc.put(e, sOcc.get(e) + 1); } else { @@ -356,6 +357,7 @@ public class LazyBag<E> extends LazyCollection<E> { /** * {@inheritDoc} */ + @Override public boolean hasNext() { synchronized (cache) { if (i < cache.size()) { @@ -382,6 +384,7 @@ public class LazyBag<E> extends LazyCollection<E> { /** * {@inheritDoc} */ + @Override public E next() { if (!nextSet) { next = inner.next(); // support null values for next @@ -396,7 +399,7 @@ public class LazyBag<E> extends LazyCollection<E> { updateCache(next); return next; } - + } /** @@ -410,7 +413,7 @@ public class LazyBag<E> extends LazyCollection<E> { * Creates a {@link LazyBag} around <code>dataSource</code>. * @param dataSource the underlying collection */ - public LazyBag(Iterable<E> dataSource) { + public LazyBag(final Iterable<E> dataSource) { super(dataSource); } @@ -436,25 +439,25 @@ public class LazyBag<E> extends LazyCollection<E> { @Override public boolean equals(final Object o) { if (o == this) { - return true; + return true; } if (!(o instanceof LazyCollection<?>)) { - return false; - } - try { - final LazyCollection<E> other = (LazyCollection<E>)o; - final LazySet<E> keys = asSet().union(other.asSet()); - for (E e : keys) { - if (count(e) != other.count(e)) { - return false; - } - } - return true; - } catch (ClassCastException unused) { - return false; - } catch (NullPointerException unused) { - return false; - } + return false; + } + try { + final LazyCollection<E> other = (LazyCollection<E>)o; + final LazySet<E> keys = asSet().union(other.asSet()); + for (final E e : keys) { + if (count(e) != other.count(e)) { + return false; + } + } + return true; + } catch (final ClassCastException unused) { + return false; + } catch (final NullPointerException unused) { + return false; + } } /** @@ -463,10 +466,10 @@ public class LazyBag<E> extends LazyCollection<E> { @Override public int hashCode() { int hashCode = 0; - for (E obj : this) { - if (obj != null) { - hashCode += obj.hashCode(); - } + for (final E obj : this) { + if (obj != null) { + hashCode += obj.hashCode(); + } } return hashCode; } @@ -474,6 +477,7 @@ public class LazyBag<E> extends LazyCollection<E> { /** * {@inheritDoc} */ + @Override public String asString(final ExecEnv env) { return appendElements(new StringBuffer("Bag{"), env).append('}').toString(); } @@ -547,6 +551,7 @@ public class LazyBag<E> extends LazyCollection<E> { * @param object the object to include * @return The bag containing all elements of self plus <code>object</code>. */ + @Override public LazyBag<E> including(final E object) { return new IncludingBag<E>(object, this); } @@ -556,7 +561,7 @@ public class LazyBag<E> extends LazyCollection<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param object * the object to include * @param index @@ -573,7 +578,7 @@ public class LazyBag<E> extends LazyCollection<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param coll * the collection to include * @return The collection containing all elements of self plus <code>coll</code>. @@ -588,7 +593,7 @@ public class LazyBag<E> extends LazyCollection<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param coll * the collection to include * @param index @@ -606,11 +611,12 @@ public class LazyBag<E> extends LazyCollection<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param object * the object to exclude * @return The bag containing all elements of self apart from all occurrences of <code>object</code>. */ + @Override public LazyBag<E> excluding(final Object object) { return new LazyBag<E>(this) { @Override @@ -618,7 +624,7 @@ public class LazyBag<E> extends LazyCollection<E> { if (dataSource == null) { return Collections.unmodifiableCollection(cache).iterator(); } - return new ExcludingIterator(object); + return new ExcludingIterator(object); } }; } @@ -628,7 +634,7 @@ public class LazyBag<E> extends LazyCollection<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param coll * the collection to exclude * @return The collection containing all elements of self minus <code>coll</code>. @@ -652,7 +658,7 @@ public class LazyBag<E> extends LazyCollection<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @return <b>if</b> self.type.elementType.oclIsKindOf(CollectionType) <b>then</b><br> * self->iterate(c; acc : Bag() = Bag{} |<br> * acc->union(c->asBag() ) )<br> @@ -684,13 +690,14 @@ public class LazyBag<E> extends LazyCollection<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param first * the first object of the range to include * @param last * the last object of the range to include * @return The bag containing all elements of self plus the bag of <code>first</code> running to <code>last</code> */ + @Override @SuppressWarnings("unchecked") public LazyBag<E> includingRange(final E first, final E last) { if (first instanceof Integer && last instanceof Integer) { @@ -785,12 +792,12 @@ public class LazyBag<E> extends LazyCollection<E> { final Iterator<Comparable<Object>> sortingKeys = new CollectIterator<Comparable<Object>>(inner, body, parentFrame); final Object[] innerCopy = inner.toArray(); final Map<Object, Comparable<Object>> elementsToKeys = new HashMap<Object, Comparable<Object>>(innerCopy.length); - for (Object o : innerCopy) { + for (final Object o : innerCopy) { elementsToKeys.put(o, sortingKeys.next()); } assert !sortingKeys.hasNext(); Arrays.sort(innerCopy, new Comparator<Object>() { - public int compare(Object o1, Object o2) { + public int compare(final Object o1, final Object o2) { return elementsToKeys.get(o1).compareTo(elementsToKeys.get(o2)); } }); diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyBagOnCollection.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyBagOnCollection.java index 563f7348..8e1e146f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyBagOnCollection.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyBagOnCollection.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyCollection.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyCollection.java index e264b586..55493dfd 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyCollection.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyCollection.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2015 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyCollections.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyCollections.java index 1d29bc05..00888092 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyCollections.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyCollections.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyList.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyList.java index ae2a71b3..5527b16f 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyList.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyList.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. + * Copyright (c) 2012-2023 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -46,9 +47,10 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { /** * Creates a {@link NonCachingList} around <code>dataSource</code>. - * @param dataSource the underlying {@link LazyList} + * + * @param dataSource the underlying (lazy) collection */ - public NonCachingList(final LazyList<E> dataSource) { + public NonCachingList(final Iterable<E> dataSource) { super(dataSource); assert dataSource != null; } @@ -60,6 +62,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { protected void createCache() { //no caching } + } /** @@ -96,7 +99,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public E get(int index) { + public E get(final int index) { final int size = ((List<E>)dataSource).size(); return index < size ? ((List<E>)dataSource).get(index) : s.get(index - size); } @@ -105,7 +108,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int indexOf(Object o) { + public int indexOf(final Object o) { final int indexOf = ((List<E>)dataSource).indexOf(o); if (indexOf > -1) { return indexOf; @@ -126,7 +129,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int lastIndexOf(Object o) { + public int lastIndexOf(final Object o) { final int lastIndexOf = s.lastIndexOf(o); if (lastIndexOf > -1) { return ((List<E>)dataSource).size() + lastIndexOf; @@ -147,7 +150,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public ListIterator<E> listIterator(int index) { + public ListIterator<E> listIterator(final int index) { return new UnionListIterator(s, index); } @@ -155,7 +158,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { return ((Collection<E>)dataSource).contains(o) || s.contains(o); } @@ -164,7 +167,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int count(Object object) { + public int count(final Object object) { return ((LazyCollection<E>)dataSource).count(object) + s.count(object); } @@ -207,16 +210,16 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class AppendListIterator extends WrappedListIterator { - + protected boolean beforeTail = true; - + /** * Creates a new {@link AppendListIterator}. */ public AppendListIterator() { super(); } - + /** * Creates a new {@link AppendListIterator}. * @param index the iterator starting index. @@ -227,7 +230,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { next(); } } - + /** * {@inheritDoc} */ @@ -236,7 +239,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { assert beforeTail || !inner.hasNext(); // not beforeTail implies not inner.hasNext() return beforeTail; } - + /** * {@inheritDoc} */ @@ -250,7 +253,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } throw new NoSuchElementException(); } - + /** * {@inheritDoc} */ @@ -258,7 +261,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public int nextIndex() { return inner.nextIndex() + (beforeTail ? 0 : 1); } - + /** * {@inheritDoc} */ @@ -266,7 +269,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public boolean hasPrevious() { return !beforeTail || inner.hasPrevious(); } - + /** * {@inheritDoc} */ @@ -278,7 +281,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } return inner.previous(); } - + /** * {@inheritDoc} */ @@ -286,7 +289,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public int previousIndex() { return inner.previousIndex() + (beforeTail ? 0 : 1); } - + } /** @@ -308,6 +311,14 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override + public E first() { + return ((LazyList<E>) dataSource).isEmpty() ? object : ((LazyList<E>) dataSource).first(); + } + + /** + * {@inheritDoc} + */ + @Override public E last() { return object; } @@ -355,7 +366,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { */ @Override public boolean contains(final Object o) { - return (object == null ? o == null : object.equals(o)) || + return (object == null ? o == null : object.equals(o)) || ((Collection<E>)dataSource).contains(o); } @@ -364,8 +375,8 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { */ @Override public int count(final Object o) { - return (object == null ? o == null : object.equals(o)) ? 1 : 0 + - ((LazyCollection<E>)dataSource).count(o); + return ((object == null ? o == null : object.equals(o)) ? 1 : 0) + + ((LazyCollection<E>) dataSource).count(o); } /** @@ -407,7 +418,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public ListIterator<E> listIterator(final int index) { return new AppendListIterator(index); } - + } /** @@ -423,16 +434,16 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class PrependIterator extends WrappedIterator { - + protected boolean beforeHead = true; - + /** * Creates a new {@link PrependIterator}. */ public PrependIterator() { super(); } - + /** * {@inheritDoc} */ @@ -440,7 +451,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public boolean hasNext() { return beforeHead || inner.hasNext(); } - + /** * {@inheritDoc} */ @@ -459,16 +470,16 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class PrependListIterator extends WrappedListIterator { - + protected boolean beforeHead = true; - + /** * Creates a new {@link PrependListIterator}. */ public PrependListIterator() { super(); } - + /** * Creates a new {@link PrependListIterator}. * @param index the iterator starting index. @@ -477,7 +488,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { super(index < 1 ? index : index - 1); this.beforeHead = index < 1; } - + /** * {@inheritDoc} */ @@ -485,7 +496,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public boolean hasNext() { return beforeHead || inner.hasNext(); } - + /** * {@inheritDoc} */ @@ -497,7 +508,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } return inner.next(); } - + /** * {@inheritDoc} */ @@ -508,7 +519,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } return inner.nextIndex() + 1; } - + /** * {@inheritDoc} */ @@ -517,7 +528,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { assert beforeHead || !inner.hasPrevious(); // not beforeHead implies not inner.hasPrevious() return !beforeHead; } - + /** * {@inheritDoc} */ @@ -531,7 +542,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } throw new NoSuchElementException(); } - + /** * {@inheritDoc} */ @@ -542,7 +553,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } return inner.previousIndex() + 1; } - + } /** @@ -602,7 +613,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int lastIndexOf(Object o) { + public int lastIndexOf(final Object o) { final int lastIndex = ((List<E>)dataSource).lastIndexOf(o) + 1; if (lastIndex > 0) { return lastIndex; @@ -630,10 +641,10 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public ListIterator<E> listIterator(int index) { + public ListIterator<E> listIterator(final int index) { return new PrependListIterator(index); } - + } /** @@ -651,16 +662,16 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class InsertAtIterator extends WrappedIterator { - + protected int i = -1; - + /** * Creates a new {@link InsertAtIterator}. */ public InsertAtIterator() { super(); } - + /** * {@inheritDoc} */ @@ -668,7 +679,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public boolean hasNext() { return i < index || inner.hasNext(); } - + /** * {@inheritDoc} */ @@ -687,16 +698,16 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class InsertAtListIterator extends WrappedListIterator { - + protected int i = -1; - + /** * Creates a new {@link InsertAtListIterator}. */ public InsertAtListIterator() { super(); } - + /** * Creates a new {@link InsertAtListIterator}. * @param index the iterator starting index, starting from 0 instead of 1. @@ -705,7 +716,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { super(index < InsertAtList.this.index ? index : index - 1); this.i = index - 1; } - + /** * {@inheritDoc} */ @@ -713,7 +724,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public boolean hasNext() { return i < index || inner.hasNext(); } - + /** * {@inheritDoc} */ @@ -724,7 +735,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } return inner.next(); } - + /** * {@inheritDoc} */ @@ -732,7 +743,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public int nextIndex() { return i + 1; } - + /** * {@inheritDoc} */ @@ -740,7 +751,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public boolean hasPrevious() { return i >= index || inner.hasPrevious(); } - + /** * {@inheritDoc} */ @@ -751,7 +762,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } return inner.previous(); } - + /** * {@inheritDoc} */ @@ -759,7 +770,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public int previousIndex() { return i; } - + } protected final int index; @@ -887,7 +898,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public ListIterator<E> listIterator(final int index) { return new InsertAtListIterator(index); } - + } /** @@ -1010,7 +1021,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public ListIterator<E> listIterator(final int index) { return new SubListListIterator(fromIndex, toIndex, index); } - + } /** @@ -1028,7 +1039,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { super(dataSource); this.last = dataSource.size() - 1; } - + /** * {@inheritDoc} */ @@ -1044,7 +1055,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public E last() { return ((List<E>)dataSource).get(0); } - + /** * {@inheritDoc} */ @@ -1052,7 +1063,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public E get(final int index) { return ((List<E>)dataSource).get(last - index); } - + /** * {@inheritDoc} */ @@ -1064,7 +1075,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } return -1; } - + /** * {@inheritDoc} */ @@ -1076,7 +1087,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } return -1; } - + /** * {@inheritDoc} */ @@ -1084,7 +1095,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public boolean contains(final Object o) { return ((List<E>)dataSource).contains(o); } - + /** * {@inheritDoc} */ @@ -1092,7 +1103,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public boolean isEmpty() { return ((List<E>)dataSource).isEmpty(); } - + /** * {@inheritDoc} */ @@ -1100,7 +1111,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public Iterator<E> iterator() { return new ReverseIterator(last); } - + /** * {@inheritDoc} */ @@ -1108,7 +1119,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public int size() { return last + 1; } - + /** * {@inheritDoc} */ @@ -1116,7 +1127,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public ListIterator<E> listIterator() { return new ReverseListIterator(last); } - + /** * {@inheritDoc} */ @@ -1124,12 +1135,12 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { public ListIterator<E> listIterator(final int index) { return new ReverseListIterator(last, index); } - + } /** * {@link LazyList} that represents a range running from a first to last {@link Integer}. - * + * * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public static class IntegerRangeList extends LazyList<Integer> { @@ -1139,7 +1150,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { /** * Creates a new {@link IntegerRangeList}. - * + * * @param first * the first object of the range to include * @param last @@ -1175,7 +1186,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public Integer get(int index) { + public Integer get(final int index) { final int element = first + index; if (element > last) { throw new IndexOutOfBoundsException(Integer.toString(index)); @@ -1187,7 +1198,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int indexOf(Object o) { + public int indexOf(final Object o) { if (contains(o)) { return (Integer) o - first; } @@ -1206,7 +1217,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int lastIndexOf(Object o) { + public int lastIndexOf(final Object o) { // All elements of a range are unique return indexOf(o); } @@ -1223,7 +1234,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public ListIterator<Integer> listIterator(int index) { + public ListIterator<Integer> listIterator(final int index) { return new IntegerRangeListIterator(first, last, index); } @@ -1231,7 +1242,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { if (o instanceof Integer) { final Integer obj = (Integer) o; return (obj >= first && obj <= last); @@ -1243,7 +1254,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int count(Object object) { + public int count(final Object object) { // All elements of a range are unique return contains(object) ? 1 : 0; } @@ -1277,7 +1288,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { /** * {@link LazyList} that represents a range running from a first to last {@link Long}. - * + * * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public static class LongRangeList extends LazyList<Long> { @@ -1287,7 +1298,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { /** * Creates a new {@link LongRangeList}. - * + * * @param first * the first object of the range to include * @param last @@ -1323,7 +1334,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public Long get(int index) { + public Long get(final int index) { final long element = first + index; if (element > last) { throw new IndexOutOfBoundsException(Integer.toString(index)); @@ -1335,7 +1346,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int indexOf(Object o) { + public int indexOf(final Object o) { if (contains(o)) { return (int) ((Long) o - first); } @@ -1354,7 +1365,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int lastIndexOf(Object o) { + public int lastIndexOf(final Object o) { // All elements of a range are unique return indexOf(o); } @@ -1371,7 +1382,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public ListIterator<Long> listIterator(int index) { + public ListIterator<Long> listIterator(final int index) { return new LongRangeListIterator(first, last, index); } @@ -1379,7 +1390,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { if (o instanceof Long) { final Long obj = (Long) o; return (obj >= first && obj <= last); @@ -1391,7 +1402,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ @Override - public int count(Object object) { + public int count(final Object object) { // All elements of a range are unique return contains(object) ? 1 : 0; } @@ -1425,7 +1436,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { /** * {@link ListIterator} that returns first the elements of the underlying collection, then the elements of the other collection. - * + * * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class UnionListIterator extends WrappedListIterator { @@ -1549,9 +1560,9 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } return inner.previousIndex(); } - + } - + /** * {@link LazyList} that implements the {@link LazyList#collect(CodeBlock)} function. * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> @@ -1559,7 +1570,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * @param <E> the element type */ public static class CollectList<E> extends LazyList<E> { - + /** * Creates a {@link CollectList} around <code>dataSource</code>. * @param dataSource the underlying {@link LazyList} @@ -1568,7 +1579,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { super(dataSource); assert dataSource != null; } - + } /** @@ -1631,7 +1642,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { return ((List<E>)cache).get(index); } int i = 0; - for (E e : this) { + for (final E e : this) { if (i == index) { return e; } @@ -1644,18 +1655,18 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * {@inheritDoc} */ public int indexOf(final Object o) { - final int index = ((List<E>)cache).indexOf(o); + final int index = ((List<E>) cache).indexOf(o); if (index > -1 || dataSource == null) { // cache complete return index; } int i = 0; if (o == null) { - for (E e : this) { + for (final E e : this) { if (e == null) return i; i++; } } else { - for (E e : this) { + for (final E e : this) { if (o.equals(e)) return i; i++; } @@ -1673,12 +1684,12 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { int i = 0; int lastIndex = -1; if (o == null) { - for (E e : this) { + for (final E e : this) { if (e == null) lastIndex = i; i++; } } else { - for (E e : this) { + for (final E e : this) { if (e.equals(o)) lastIndex = i; i++; } @@ -1737,23 +1748,23 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { /** * {@inheritDoc} - * + * * Unsupported in this implementation. * @throws UnsupportedOperationException */ - public void move(int newPosition, E object) { + public void move(final int newPosition, final E object) { throw new UnsupportedOperationException(); } /** * {@inheritDoc} - * + * * Unsupported in this implementation. * @throws UnsupportedOperationException */ - public E move(int newPosition, int oldPosition) { + public E move(final int newPosition, final int oldPosition) { throw new UnsupportedOperationException(); } @@ -1763,18 +1774,18 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { @Override public boolean equals(final Object o) { if (o == this) { - return true; + return true; } if (!(o instanceof List<?>)) { - return false; + return false; } final Iterator<E> e1 = iterator(); final Iterator<?> e2 = ((Collection<?>)o).iterator(); while (e1.hasNext() && e2.hasNext()) { - E o1 = e1.next(); - Object o2 = e2.next(); - if (!(o1 == null ? o2 == null : o1.equals(o2))) - return false; + final E o1 = e1.next(); + final Object o2 = e2.next(); + if (!(o1 == null ? o2 == null : o1.equals(o2))) + return false; } return !(e1.hasNext() || e2.hasNext()); } @@ -1785,8 +1796,8 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { @Override public int hashCode() { int hashCode = 1; - for (E obj : this) { - hashCode = 31 * hashCode + (obj == null ? 0 : obj.hashCode()); + for (final E obj : this) { + hashCode = 31 * hashCode + (obj == null ? 0 : obj.hashCode()); } return hashCode; } @@ -1794,13 +1805,14 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { /** * {@inheritDoc} */ + @Override public String asString(final ExecEnv env) { return appendElements(new StringBuffer("Sequence{"), env).append('}').toString(); } /** * Returns the <code>i</code>-th element of this list. List index starts at 1. - * + * * @param i * the element index * @return The <code>i</code>-th element of this list. @@ -1849,7 +1861,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { */ public E first() { if (cache.size() > 0) { - return ((List<E>)cache).get(0); + return ((List<E>) cache).get(0); } return iterator().next(); } @@ -1897,7 +1909,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param s * the list to union with this * @param index @@ -1917,7 +1929,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @return <b>if</b> self.type.elementType.oclIsKindOf(CollectionType) <b>then</b><br> * self->iterate(c; acc : Sequence() = Sequence{} |<br> * acc->union(c->asSequence() ) )<br> @@ -1973,7 +1985,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p><i>Lazy operation.</i></p> * @param lower the sub-list lower bound, inclusive * @param upper the sub-list upper bound, inclusive - * @return the sub-list of this list. + * @return the sub-list of this list. */ public LazyList<E> subSequence(final int lower, final int upper) { return new SubList<E>(lower - 1, upper, this); @@ -1985,6 +1997,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * @param object the object to include * @return The sequence containing all elements of self plus <code>object</code> added as the last element. */ + @Override public LazyList<E> including(final E object) { return append(object); } @@ -1994,7 +2007,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param object * the object to include * @param index @@ -2015,7 +2028,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param coll * the collection to include * @return The collection containing all elements of self plus <code>coll</code>. @@ -2030,7 +2043,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param coll * the collection to include * @param index @@ -2051,11 +2064,12 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param object * the object to exclude * @return The sequence containing all elements of self apart from all occurrences of <code>object</code>. */ + @Override public LazyList<E> excluding(final Object object) { return new LazyList<E>(this) { @Override @@ -2063,7 +2077,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { if (dataSource == null) { return Collections.unmodifiableCollection(cache).iterator(); } - return new ExcludingIterator(object); + return new ExcludingIterator(object); } }; } @@ -2073,7 +2087,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param coll * the collection to exclude * @return The collection containing all elements of self minus <code>coll</code>. @@ -2096,7 +2110,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @return The sequence containing the same elements but with the opposite order. */ public LazyList<E> reverse() { @@ -2104,7 +2118,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { } /** - * Returns the Sequence identical to the object itself. This operation exists for convenience reasons. + * Returns the Sequence identical to the object itself. This operation exists for convenience reasons. * <p><i>Lazy operation.</i></p> * @return The Sequence identical to the object itself. This operation exists for convenience reasons. */ @@ -2119,7 +2133,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * <p> * <i>Lazy operation.</i> * </p> - * + * * @param first * the first object of the range to include * @param last @@ -2127,6 +2141,7 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { * @return The sequence containing all elements of self plus the sequence of <code>first</code> running to <code>last</code> added as * the last elements */ + @Override @SuppressWarnings("unchecked") public LazyList<E> includingRange(final E first, final E last) { if (first instanceof Integer && last instanceof Integer) { @@ -2246,12 +2261,12 @@ public class LazyList<E> extends LazyCollection<E> implements EList<E> { final Iterator<Comparable<Object>> sortingKeys = new CollectIterator<Comparable<Object>>(inner, body, parentFrame); final Object[] innerCopy = inner.toArray(); final Map<Object, Comparable<Object>> elementsToKeys = new HashMap<Object, Comparable<Object>>(innerCopy.length); - for (Object o : innerCopy) { + for (final Object o : innerCopy) { elementsToKeys.put(o, sortingKeys.next()); } assert !sortingKeys.hasNext(); Arrays.sort(innerCopy, new Comparator<Object>() { - public int compare(Object o1, Object o2) { + public int compare(final Object o1, final Object o2) { return elementsToKeys.get(o1).compareTo(elementsToKeys.get(o2)); } }); diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyListOnCollection.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyListOnCollection.java index 5bc20802..b037f9d7 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyListOnCollection.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyListOnCollection.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyListOnList.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyListOnList.java index f0fed8bb..ce9aebe2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyListOnList.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyListOnList.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyOrderedSet.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyOrderedSet.java index 632ade5d..4fb28f3c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyOrderedSet.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazyOrderedSet.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. + * Copyright (c) 2023 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -175,7 +176,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public ListIterator<E> listIterator(final int index) { return new SubListListIterator(fromIndex, toIndex, index); } - + } /** @@ -187,24 +188,24 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @param <E> the collection element type */ public static class AppendOrderedSet<E> extends NonCachingOrderedSet<E> { - + /** * {@link Iterator} that appends an object to the underlying * collection, except when it already occurs in the underlying collection. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class AppendOrderedSetIterator extends WrappedIterator { - + protected boolean beforeTail = true; protected boolean innerNext; // cache last inner.hasNext() invocation - + /** * Creates a new {@link AppendOrderedSetIterator}. */ public AppendOrderedSetIterator() { super(); } - + /** * {@inheritDoc} */ @@ -217,7 +218,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List assert containsObjectSet; return (beforeTail && !containsObject) || (innerNext = inner.hasNext()); } - + /** * {@inheritDoc} */ @@ -240,24 +241,24 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List throw new NoSuchElementException(); } } - + /** * {@link Iterator} that appends an object to the underlying * collection, except when it already occurs in the underlying collection. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class AppendOrderedSetListIterator extends WrappedListIterator { - + protected boolean beforeTail = true; protected boolean innerNext; // cache last inner.hasNext() invocation - + /** * Creates a new {@link AppendOrderedSetListIterator}. */ public AppendOrderedSetListIterator() { super(); } - + /** * Creates a new {@link AppendOrderedSetListIterator}. * @param index the iterator starting index. @@ -268,7 +269,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List next(); } } - + /** * {@inheritDoc} */ @@ -281,7 +282,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List assert containsObjectSet; return (beforeTail && !containsObject) || (innerNext = inner.hasNext()); } - + /** * {@inheritDoc} */ @@ -343,7 +344,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List assert beforeTail || (containsObjectSet && !containsObject); // !beforeTail implies (containsObjectSet && !containsObject) return inner.previousIndex() + (beforeTail ? 0 : 1); } - + } protected final E object; @@ -359,25 +360,25 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List super(dataSource); this.object = object; } - + /** * {@inheritDoc} */ @Override public boolean contains(final Object o) { - return (object == null ? o == null : object.equals(o)) || + return (object == null ? o == null : object.equals(o)) || ((Collection<E>)dataSource).contains(o); } - + /** * {@inheritDoc} */ @Override public int count(final Object o) { - return (object == null ? o == null : object.equals(o)) ? 1 : - ((LazyCollection<E>)dataSource).count(o); + return (object == null ? o == null : object.equals(o)) ? 1 : + ((LazyCollection<E>)dataSource).count(o); } - + /** * {@inheritDoc} */ @@ -385,7 +386,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public boolean isEmpty() { return false; } - + /** * {@inheritDoc} */ @@ -393,7 +394,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public Iterator<E> iterator() { return new AppendOrderedSetIterator(); } - + /** * {@inheritDoc} */ @@ -412,8 +413,38 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override + public E first() { + if (!((LazyOrderedSet<E>) dataSource).isEmpty()) { + return ((LazyOrderedSet<E>) dataSource).first(); + } + if (!containsObjectSet) { + containsObject = ((Collection<E>) dataSource).contains(object); + containsObjectSet = true; + } + assert containsObjectSet; + if (!containsObject) { + return object; + } + throw new NoSuchElementException(); + } + + /** + * {@inheritDoc} + */ + @Override public E last() { - return ((List<E>)dataSource).get(size() - 1); + if (!containsObjectSet) { + containsObject = ((Collection<E>) dataSource).contains(object); + containsObjectSet = true; + } + assert containsObjectSet; + if (!containsObject) { + return object; + } + if (!((LazyOrderedSet<E>) dataSource).isEmpty()) { + return ((LazyOrderedSet<E>) dataSource).last(); + } + throw new NoSuchElementException(); } /** @@ -433,7 +464,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List if (index == size && !containsObject) { return object; } - throw new NoSuchElementException(); + throw new IndexOutOfBoundsException(); } /** @@ -472,7 +503,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public ListIterator<E> listIterator(final int index) { return new AppendOrderedSetListIterator(index); } - + } /** @@ -484,16 +515,16 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @param <E> the collection element type */ public static class PrependOrderedSet<E> extends AppendOrderedSet<E> { - + /** * {@link Iterator} that prepends an object to the underlying * collection, except when it already occurs in the underlying collection. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class PrependOrderedSetIterator extends WrappedIterator { - + protected boolean beforeHead; - + /** * Creates a new {@link PrependOrderedSetIterator}. */ @@ -506,7 +537,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List assert containsObjectSet; beforeHead = !containsObject; } - + /** * {@inheritDoc} */ @@ -516,7 +547,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List assert !beforeHead || !containsObject; // beforeHead implies !containsObject return beforeHead || inner.hasNext(); } - + /** * {@inheritDoc} */ @@ -531,17 +562,17 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List return inner.next(); } } - + /** * {@link Iterator} that appends an object to the underlying * collection, except when it already occurs in the underlying collection. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class PrependOrderedSetListIterator extends WrappedListIterator { - + protected boolean beforeHead; protected boolean innerPrev; // cache value of inner.hasPrevious() - + /** * Creates a new {@link PrependOrderedSetListIterator}. */ @@ -554,7 +585,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List assert containsObjectSet; this.beforeHead = !containsObject; } - + /** * Creates a new {@link PrependOrderedSetListIterator}. * @param index the iterator starting index. @@ -571,7 +602,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List next(); } } - + /** * {@inheritDoc} */ @@ -581,7 +612,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List assert !beforeHead || !containsObject; // beforeHead implies !containsObject return beforeHead || inner.hasNext(); } - + /** * {@inheritDoc} */ @@ -595,7 +626,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return inner.next(); } - + /** * {@inheritDoc} */ @@ -608,7 +639,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return inner.nextIndex() + (containsObject ? 0 : 1); } - + /** * {@inheritDoc} */ @@ -619,7 +650,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List assert beforeHead || !inner.hasPrevious(); // not beforeHead implies not inner.hasPrevious() return !beforeHead && (!containsObject || (innerPrev = inner.hasPrevious())); } - + /** * {@inheritDoc} */ @@ -637,7 +668,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } throw new NoSuchElementException(); } - + /** * {@inheritDoc} */ @@ -650,7 +681,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return inner.previousIndex() + (containsObject ? 0 : 1); } - + } /** @@ -661,7 +692,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public PrependOrderedSet(final E object, final LazyOrderedSet<E> dataSource) { super(object, dataSource); } - + /** * {@inheritDoc} */ @@ -672,14 +703,23 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List /** * {@inheritDoc} - * - * @see org.eclipse.m2m.atl.emftvm.util.LazyOrderedSet#first() */ @Override public E first() { - return ((List<E>)dataSource).get(size() - 1); + if (!containsObjectSet) { + containsObject = ((Collection<E>) dataSource).contains(object); + containsObjectSet = true; + } + assert containsObjectSet; + if (!containsObject) { + return object; + } + if (!((LazyOrderedSet<E>) dataSource).isEmpty()) { + return ((LazyOrderedSet<E>) dataSource).first(); + } + throw new NoSuchElementException(); } - + /** * {@inheritDoc} */ @@ -698,7 +738,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } throw new NoSuchElementException(); } - + /** * {@inheritDoc} */ @@ -719,7 +759,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List return ((List<E>)dataSource).get(index); } } - + /** * {@inheritDoc} */ @@ -739,7 +779,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List final int index = ((List<E>)dataSource).indexOf(o); return (index > -1) ? index + 1 : -1; } - + /** * {@inheritDoc} */ @@ -747,7 +787,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public ListIterator<E> listIterator() { return new PrependOrderedSetListIterator(); } - + /** * {@inheritDoc} */ @@ -755,7 +795,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public ListIterator<E> listIterator(final int index) { return new PrependOrderedSetListIterator(index); } - + } /** @@ -768,7 +808,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @param <E> the collection element type */ public static class InsertAtOrderedSet<E> extends AppendOrderedSet<E> { - + /** * {@link Iterator} that appends an object to the underlying * collection, except when it already occurs in the underlying collection. @@ -776,16 +816,16 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class InsertAtOrderedSetIterator extends WrappedIterator { - + protected int i = -1; - + /** * Creates a new {@link InsertAtOrderedSetIterator}. */ public InsertAtOrderedSetIterator() { super(); } - + /** * {@inheritDoc} */ @@ -794,7 +834,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List // next() will throw exception when index is out of bounds return i < index || inner.hasNext(); } - + /** * {@inheritDoc} */ @@ -813,24 +853,24 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List return inner.next(); } } - + /** * {@link Iterator} that appends an object to the underlying * collection, except when it already occurs in the underlying collection. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class InsertAtOrderedSetListIterator extends WrappedListIterator { - + protected int i = -1; protected boolean innerNext; // cache last inner.hasNext() invocation - + /** * Creates a new {@link InsertAtOrderedSetListIterator}. */ public InsertAtOrderedSetListIterator() { super(); } - + /** * Creates a new {@link InsertAtOrderedSetListIterator}. * @param index the iterator starting index. @@ -843,7 +883,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List next(); } } - + /** * {@inheritDoc} */ @@ -852,7 +892,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List // next() will throw exception when index is out of bounds return i < index || inner.hasNext(); } - + /** * {@inheritDoc} */ @@ -870,7 +910,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return inner.next(); } - + /** * {@inheritDoc} */ @@ -878,7 +918,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public int nextIndex() { return i + 1; } - + /** * {@inheritDoc} */ @@ -887,7 +927,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List // previous() will throw exception when index is out of bounds return i >= index || inner.hasPrevious(); } - + /** * {@inheritDoc} */ @@ -905,7 +945,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return inner.previous(); } - + /** * {@inheritDoc} */ @@ -913,11 +953,11 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public int previousIndex() { return i; } - + } - + protected final int index; - + /** * Creates a new {@link InsertAtOrderedSet}. * @param object the object to insert @@ -931,7 +971,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List throw new IndexOutOfBoundsException(String.valueOf(index)); } } - + /** * {@inheritDoc} */ @@ -982,7 +1022,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } throw new IndexOutOfBoundsException(String.valueOf(index)); } - + /** * {@inheritDoc} */ @@ -1014,7 +1054,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } throw new IndexOutOfBoundsException(String.valueOf(index)); } - + /** * {@inheritDoc} */ @@ -1048,7 +1088,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return -1; } - + /** * {@inheritDoc} */ @@ -1056,7 +1096,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public ListIterator<E> listIterator() { return new InsertAtOrderedSetListIterator(); } - + /** * {@inheritDoc} */ @@ -1064,7 +1104,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public ListIterator<E> listIterator(final int index) { return new InsertAtOrderedSetListIterator(index); } - + } /** @@ -1075,24 +1115,24 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @param <E> the collection element type */ public static class ExcludingOrderedSet<E> extends NonCachingOrderedSet<E> { - + /** * {@link Iterator} that excludes a given object. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class ExcludingOrderedSetIterator extends WrappedIterator { - + protected int i = -1; protected E next; protected boolean nextSet; - + /** * Creates a new {@link ExcludingOrderedSetIterator}. */ public ExcludingOrderedSetIterator() { super(); } - + /** * {@inheritDoc} */ @@ -1117,7 +1157,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return hasNext; } - + /** * {@inheritDoc} */ @@ -1138,26 +1178,26 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List return next; } } - + /** * {@link ListIterator} that excludes a given object. * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public class ExcludingOrderedSetListIterator extends WrappedListIterator { - + protected int i = -1; protected E next; protected boolean nextSet; protected E prev; protected boolean prevSet; - + /** * Creates a new {@link ExcludingIterator}. */ public ExcludingOrderedSetListIterator() { super(); } - + /** * Creates a new {@link ExcludingIterator}. * @param index the iterator starting index. @@ -1171,7 +1211,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List this.i = index - 1; } } - + /** * {@inheritDoc} */ @@ -1196,7 +1236,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return hasNext; } - + /** * {@inheritDoc} */ @@ -1292,25 +1332,25 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List super(dataSource); this.object = object; } - + /** * {@inheritDoc} */ @Override public boolean contains(final Object o) { - return !(object == null ? o == null : object.equals(o)) && + return !(object == null ? o == null : object.equals(o)) && ((Collection<E>)dataSource).contains(o); } - + /** * {@inheritDoc} */ @Override public int count(final Object o) { - return (object == null ? o == null : object.equals(o)) ? 0 : - ((LazyCollection<E>)dataSource).count(o); + return (object == null ? o == null : object.equals(o)) ? 0 : + ((LazyCollection<E>)dataSource).count(o); } - + /** * {@inheritDoc} */ @@ -1318,7 +1358,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public boolean isEmpty() { return !iterator().hasNext(); } - + /** * {@inheritDoc} */ @@ -1329,7 +1369,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return new ExcludingOrderedSetIterator(); } - + /** * {@inheritDoc} */ @@ -1425,7 +1465,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return new ExcludingOrderedSetListIterator(index); } - + } /** @@ -1443,7 +1483,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List super(dataSource); this.last = dataSource.size() - 1; } - + /** * {@inheritDoc} */ @@ -1459,7 +1499,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public E last() { return ((List<E>)dataSource).get(0); } - + /** * {@inheritDoc} */ @@ -1467,7 +1507,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public E get(final int index) { return ((List<E>)dataSource).get(last - index); } - + /** * {@inheritDoc} */ @@ -1479,7 +1519,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return -1; } - + /** * {@inheritDoc} */ @@ -1491,7 +1531,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List } return -1; } - + /** * {@inheritDoc} */ @@ -1499,7 +1539,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public boolean contains(final Object o) { return ((List<E>)dataSource).contains(o); } - + /** * {@inheritDoc} */ @@ -1507,7 +1547,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public boolean isEmpty() { return ((List<E>)dataSource).isEmpty(); } - + /** * {@inheritDoc} */ @@ -1515,7 +1555,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public Iterator<E> iterator() { return new ReverseIterator(last); } - + /** * {@inheritDoc} */ @@ -1523,7 +1563,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public int size() { return last + 1; } - + /** * {@inheritDoc} */ @@ -1531,7 +1571,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public ListIterator<E> listIterator() { return new ReverseListIterator(last); } - + /** * {@inheritDoc} */ @@ -1539,12 +1579,12 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public ListIterator<E> listIterator(final int index) { return new ReverseListIterator(last, index); } - + } /** * {@link LazyOrderedSet} that represents a range running from a first to last {@link Integer}. - * + * * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public static class IntegerRangeOrderedSet extends LazyOrderedSet<Integer> { @@ -1554,7 +1594,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List /** * Creates a new {@link IntegerRangeOrderedSet}. - * + * * @param first * the first object of the range to include * @param last @@ -1590,7 +1630,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public Integer get(int index) { + public Integer get(final int index) { final int element = first + index; if (element > last) { throw new IndexOutOfBoundsException(Integer.toString(index)); @@ -1602,7 +1642,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public int indexOf(Object o) { + public int indexOf(final Object o) { if (contains(o)) { return (Integer) o - first; } @@ -1621,7 +1661,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public int lastIndexOf(Object o) { + public int lastIndexOf(final Object o) { // All elements of a range are unique return indexOf(o); } @@ -1638,7 +1678,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public ListIterator<Integer> listIterator(int index) { + public ListIterator<Integer> listIterator(final int index) { return new IntegerRangeListIterator(first, last, index); } @@ -1646,7 +1686,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { if (o instanceof Integer) { final Integer obj = (Integer) o; return (obj >= first && obj <= last); @@ -1658,7 +1698,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public int count(Object object) { + public int count(final Object object) { // All elements of a range are unique return contains(object) ? 1 : 0; } @@ -1692,7 +1732,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List /** * {@link LazyOrderedSet} that represents a range running from a first to last {@link Long}. - * + * * @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a> */ public static class LongRangeOrderedSet extends LazyOrderedSet<Long> { @@ -1702,7 +1742,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List /** * Creates a new {@link LongRangeList}. - * + * * @param first * the first object of the range to include * @param last @@ -1738,7 +1778,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public Long get(int index) { + public Long get(final int index) { final long element = first + index; if (element > last) { throw new IndexOutOfBoundsException(Integer.toString(index)); @@ -1750,7 +1790,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public int indexOf(Object o) { + public int indexOf(final Object o) { if (contains(o)) { return (int) ((Long) o - first); } @@ -1769,7 +1809,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public int lastIndexOf(Object o) { + public int lastIndexOf(final Object o) { // All elements of a range are unique return indexOf(o); } @@ -1786,7 +1826,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public ListIterator<Long> listIterator(int index) { + public ListIterator<Long> listIterator(final int index) { return new LongRangeListIterator(first, last, index); } @@ -1794,7 +1834,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { if (o instanceof Integer) { final Integer obj = (Integer) o; return (obj >= first && obj <= last); @@ -1806,7 +1846,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * {@inheritDoc} */ @Override - public int count(Object object) { + public int count(final Object object) { // All elements of a range are unique return contains(object) ? 1 : 0; } @@ -1886,7 +1926,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @param element the object to add * @throws UnsupportedOperationException */ - public void add(int index, E element) { + public void add(final int index, final E element) { throw new UnsupportedOperationException(); } @@ -1897,19 +1937,19 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @return nothing * @throws UnsupportedOperationException */ - public boolean addAll(int index, Collection<? extends E> c) { + public boolean addAll(final int index, final Collection<? extends E> c) { throw new UnsupportedOperationException(); } /** * {@inheritDoc} */ - public E get(int index) { + public E get(final int index) { if (index < cache.size()) { return ((List<E>)cache).get(index); } int i = 0; - for (E e : this) { + for (final E e : this) { if (i == index) { return e; } @@ -1921,13 +1961,13 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List /** * {@inheritDoc} */ - public int indexOf(Object o) { + public int indexOf(final Object o) { final int index = ((List<E>)cache).indexOf(o); if (index > -1 || dataSource == null) { // cache complete return index; } int i = 0; - for (E e : this) { + for (final E e : this) { if (e == o) { return i; } @@ -1939,7 +1979,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List /** * {@inheritDoc} */ - public int lastIndexOf(Object o) { + public int lastIndexOf(final Object o) { return indexOf(o); // elements occur only once } @@ -1956,7 +1996,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List /** * {@inheritDoc} */ - public ListIterator<E> listIterator(int index) { + public ListIterator<E> listIterator(final int index) { if (dataSource == null) { // cache complete return Collections.unmodifiableList((List<E>)cache).listIterator(index); } @@ -1969,7 +2009,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @return nothing * @throws UnsupportedOperationException */ - public E remove(int index) { + public E remove(final int index) { throw new UnsupportedOperationException(); } @@ -1980,7 +2020,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @return nothing * @throws UnsupportedOperationException */ - public E set(int index, E element) { + public E set(final int index, final E element) { throw new UnsupportedOperationException(); } @@ -1998,18 +2038,18 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List @Override public boolean equals(final Object o) { if (o == this) { - return true; + return true; } if (!(o instanceof List<?> && o instanceof Set<?>)) { - return false; + return false; } final Iterator<E> e1 = iterator(); final Iterator<?> e2 = ((Collection<?>)o).iterator(); while (e1.hasNext() && e2.hasNext()) { - E o1 = e1.next(); - Object o2 = e2.next(); - if (!(o1 == null ? o2 == null : o1.equals(o2))) - return false; + final E o1 = e1.next(); + final Object o2 = e2.next(); + if (!(o1 == null ? o2 == null : o1.equals(o2))) + return false; } return !(e1.hasNext() || e2.hasNext()); } @@ -2021,14 +2061,14 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List public int hashCode() { // List hashcode (shifted) int hashCode = 1; - for (E obj : this) { - hashCode = 31 * hashCode + (obj == null ? 0 : obj.hashCode()); + for (final E obj : this) { + hashCode = 31 * hashCode + (obj == null ? 0 : obj.hashCode()); } // Set hashcode (to distinguish from plain Lists) - for (E obj : this) { - if (obj != null) { - hashCode += obj.hashCode(); - } + for (final E obj : this) { + if (obj != null) { + hashCode += obj.hashCode(); + } } return hashCode; } @@ -2036,6 +2076,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List /** * {@inheritDoc} */ + @Override public String asString(final ExecEnv env) { return appendElements(new StringBuffer("OrderedSet{"), env).append('}').toString(); } @@ -2043,11 +2084,12 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List /** * Returns the number of occurrences of <code>object</code> in self.<br> * <code>post: result <= 1</code> - * + * * @param o * the object to count * @return The number of occurrences of <code>object</code> in self. */ + @Override public int count(final Object o) { return contains(o) ? 1 : 0; } @@ -2159,7 +2201,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p> * <i>Lazy operation.</i> * </p> - * + * * @param s * the ordered set to union with this * @param index @@ -2178,7 +2220,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p> * <i>Lazy operation.</i> * </p> - * + * * @param s * the collection to union with self * @return The union of self and <code>s</code>. @@ -2301,6 +2343,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @param object the element to include * @return The set containing all elements of self plus <code>object</code> */ + @Override public LazyOrderedSet<E> including(final E object) { return append(object); } @@ -2310,7 +2353,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p> * <i>Lazy operation.</i> * </p> - * + * * @param object * the object to include * @param index @@ -2331,7 +2374,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p> * <i>Lazy operation.</i> * </p> - * + * * @param coll * the collection to include * @return The collection containing all elements of self plus <code>coll</code>. @@ -2346,7 +2389,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p> * <i>Lazy operation.</i> * </p> - * + * * @param coll * the collection to include * @param index @@ -2367,11 +2410,12 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p> * <i>Lazy operation.</i> * </p> - * + * * @param object * the element to exclude * @return The set containing all elements of self without <code>object</code>. */ + @Override public LazyOrderedSet<E> excluding(final Object object) { return new ExcludingOrderedSet<E>(object, this); } @@ -2381,7 +2425,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p> * <i>Lazy operation.</i> * </p> - * + * * @param coll * the collection to exclude * @return The collection containing all elements of self minus <code>coll</code>. @@ -2404,7 +2448,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p> * <i>Lazy operation.</i> * </p> - * + * * @param s * the collection to perform the symmetric difference with * @return The set containing all the elements that are in self or <code>s</code>, but not in both. @@ -2472,7 +2516,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p><i>Lazy operation.</i></p> * @param lower the sub-range lower bound, inclusive * @param upper the sub-range upper bound, inclusive - * @return The sub-set of self starting at number <code>lower</code>, up to and including element number <code>upper</code>. + * @return The sub-set of self starting at number <code>lower</code>, up to and including element number <code>upper</code>. */ public LazyOrderedSet<E> subSequence(final int lower, final int upper) { return new SubOrderedSet<E>(lower - 1, upper, this); @@ -2502,7 +2546,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * <p> * <i>Lazy operation.</i> * </p> - * + * * @param first * the first object of the range to include * @param last @@ -2510,6 +2554,7 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List * @return The OrderedSet containing all elements of self plus the OrderedSet of <code>first</code> running to <code>last</code> added * as the last elements */ + @Override @SuppressWarnings("unchecked") public LazyOrderedSet<E> includingRange(final E first, final E last) { if (first instanceof Integer && last instanceof Integer) { @@ -2604,12 +2649,12 @@ public class LazyOrderedSet<E> extends LazyCollection<E> implements Set<E>, List final Iterator<Comparable<Object>> sortingKeys = new CollectIterator<Comparable<Object>>(inner, body, parentFrame); final Object[] innerCopy = inner.toArray(); final Map<Object, Comparable<Object>> elementsToKeys = new HashMap<Object, Comparable<Object>>(innerCopy.length); - for (Object o : innerCopy) { + for (final Object o : innerCopy) { elementsToKeys.put(o, sortingKeys.next()); } assert !sortingKeys.hasNext(); Arrays.sort(innerCopy, new Comparator<Object>() { - public int compare(Object o1, Object o2) { + public int compare(final Object o1, final Object o2) { return elementsToKeys.get(o1).compareTo(elementsToKeys.get(o2)); } }); diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazySet.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazySet.java index 52e55237..6461a8d9 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazySet.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazySet.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazySetOnSet.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazySetOnSet.java index f9280d37..4cb74c15 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazySetOnSet.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/LazySetOnSet.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/MethodSignature.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/MethodSignature.java index f150c0fb..16e39ec7 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/MethodSignature.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/MethodSignature.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2016-2017 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleNotFoundException.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleNotFoundException.java index cab7a952..e0fabea2 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleNotFoundException.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleNotFoundException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleResolver.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleResolver.java index bd2f8e2e..8c5e891b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleResolver.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleResolver.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleResolverFactory.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleResolverFactory.java index 2183513b..74df937a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleResolverFactory.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ModuleResolverFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/NativeCodeBlock.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/NativeCodeBlock.java index 33649ebb..2399ab94 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/NativeCodeBlock.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/NativeCodeBlock.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/NativeTypes.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/NativeTypes.java index 80eb6b72..a10dc18b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/NativeTypes.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/NativeTypes.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/OCLOperations.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/OCLOperations.java index 67dc025d..27f6a562 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/OCLOperations.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/OCLOperations.java @@ -2,9 +2,9 @@ * Copyright (c) 2011 Vrije Universiteit Brussel. * Copyright (c) 2017 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -37,6 +37,7 @@ import org.eclipse.m2m.atl.common.ATLLogger; import org.eclipse.m2m.atl.emftvm.CodeBlock; import org.eclipse.m2m.atl.emftvm.EmftvmFactory; import org.eclipse.m2m.atl.emftvm.ExecEnv; +import org.eclipse.m2m.atl.emftvm.Field; import org.eclipse.m2m.atl.emftvm.Model; import org.eclipse.m2m.atl.emftvm.Module; import org.eclipse.m2m.atl.emftvm.Operation; @@ -616,6 +617,59 @@ public final class OCLOperations { } }); ///////////////////////////////////////////////////////////////////// + // Bag + ///////////////////////////////////////////////////////////////////// + createOperation(false, "-", Types.BAG_TYPE, Types.BAG_TYPE, + new String[][][] { { { "coll" }, Types.COLLECTION_TYPE } }, new NativeCodeBlock() { + @SuppressWarnings("unchecked") + @Override + public Object execute(final StackFrame frame) { + final LazyBag<Object> self = (LazyBag<Object>) frame.getLocal(0, 0); + final LazyCollection<Object> coll = (LazyCollection<Object>) frame.getLocal(0, 1); + return self.excludingAll(coll); + } + }); + ///////////////////////////////////////////////////////////////////// + // OrderedSet + ///////////////////////////////////////////////////////////////////// + createOperation(false, "-", Types.ORDERED_SET_TYPE, Types.ORDERED_SET_TYPE, + new String[][][] { { { "coll" }, Types.COLLECTION_TYPE } }, new NativeCodeBlock() { + @SuppressWarnings("unchecked") + @Override + public Object execute(final StackFrame frame) { + final LazyOrderedSet<Object> self = (LazyOrderedSet<Object>) frame.getLocal(0, 0); + final LazyCollection<Object> coll = (LazyCollection<Object>) frame.getLocal(0, 1); + return self.excludingAll(coll); + } + }); + ///////////////////////////////////////////////////////////////////// + // Sequence + ///////////////////////////////////////////////////////////////////// + createOperation(false, "-", Types.SEQUENCE_TYPE, Types.SEQUENCE_TYPE, + new String[][][] { { { "coll" }, Types.COLLECTION_TYPE } }, new NativeCodeBlock() { + @SuppressWarnings("unchecked") + @Override + public Object execute(final StackFrame frame) { + final LazyList<Object> self = (LazyList<Object>) frame.getLocal(0, 0); + final LazyCollection<Object> coll = (LazyCollection<Object>) frame.getLocal(0, 1); + return self.excludingAll(coll); + } + }); + ///////////////////////////////////////////////////////////////////// + // Set + ///////////////////////////////////////////////////////////////////// + createOperation(false, "-", Types.SET_TYPE, Types.SET_TYPE, + new String[][][] { { { "coll" }, Types.COLLECTION_TYPE } }, + new NativeCodeBlock() { + @SuppressWarnings("unchecked") + @Override + public Object execute(final StackFrame frame) { + final LazySet<Object> self = (LazySet<Object>) frame.getLocal(0, 0); + final LazyCollection<Object> coll = (LazyCollection<Object>) frame.getLocal(0, 1); + return self.excludingAll(coll); + } + }); + ///////////////////////////////////////////////////////////////////// // JavaCollection ///////////////////////////////////////////////////////////////////// createOperation(false, "resolve", Types.JAVA_COLLECTION_TYPE, Types.SEQUENCE_TYPE, @@ -811,6 +865,115 @@ public final class OCLOperations { rule, name, EMFTVMUtil.toPrettyString(object, frame.getEnv()))); } }); + createOperation(true, "refGetValue", Types.EXEC_ENV_TYPE, Types.OCL_ANY_TYPE, + new String[][][]{{{"propname"}, Types.STRING_TYPE}}, + new NativeCodeBlock() { + @Override + public Object execute(final StackFrame frame) { + final ExecEnv env = frame.getEnv(); + final String propname = (String) frame.getLocal(0, 0); + final Field field = env.findStaticField(EXEC_ENV, propname); + if (field != null) { + return field.getStaticValue(frame); + } + throw new VMException(frame, + String.format("Cannot find property %s::%s", + EMFTVMUtil.toPrettyString(EXEC_ENV, env), propname)); + } + }); + createOperation(false, "refGetValue", Types.EXEC_ENV_TYPE, Types.OCL_ANY_TYPE, + new String[][][]{{{"propname"}, Types.STRING_TYPE}}, + new NativeCodeBlock() { + @Override + public Object execute(final StackFrame frame) { + final ExecEnv env = (ExecEnv) frame.getLocal(0, 0); + final String propname = (String) frame.getLocal(0, 1); + final Field field = env.findStaticField(EXEC_ENV, propname); + if (field != null) { + return field.getStaticValue(frame); + } + throw new VMException(frame, + String.format("Cannot find property %s::%s", + EMFTVMUtil.toPrettyString(EXEC_ENV, env), propname)); + } + }); + createOperation(true, "refSetValue", Types.EXEC_ENV_TYPE, Types.EXEC_ENV_TYPE, + new String[][][]{{{"propname"}, Types.STRING_TYPE}, {{"value"}, Types.OCL_ANY_TYPE}}, + new NativeCodeBlock() { + @Override + public Object execute(final StackFrame frame) { + final ExecEnv env = frame.getEnv(); + final String propname = (String) frame.getLocal(0, 0); + final Object value = frame.getLocal(0, 1); + final Field field = env.findStaticField(EXEC_ENV, propname); + if (field != null) { + field.setStaticValue(value); + return env; + } + throw new VMException(frame, + String.format("Cannot find property %s::%s", + EMFTVMUtil.toPrettyString(EXEC_ENV, env), propname)); + } + }); + createOperation(false, "refSetValue", Types.EXEC_ENV_TYPE, Types.EXEC_ENV_TYPE, + new String[][][] { { { "propname" }, Types.STRING_TYPE }, { { "value" }, Types.OCL_ANY_TYPE } }, + new NativeCodeBlock() { + @Override + public Object execute(final StackFrame frame) { + final ExecEnv env = (ExecEnv) frame.getLocal(0, 0); + final String propname = (String) frame.getLocal(0, 1); + final Object value = frame.getLocal(0, 2); + final Field field = env.findStaticField(EXEC_ENV, propname); + if (field != null) { + field.setStaticValue(value); + return env; + } + throw new VMException(frame, String.format("Cannot find property %s::%s", + EMFTVMUtil.toPrettyString(EXEC_ENV, env), propname)); + } + }); + createOperation(true, "refUnsetValue", Types.EXEC_ENV_TYPE, Types.EXEC_ENV_TYPE, + new String[][][]{{{"propname"}, Types.STRING_TYPE}}, + new NativeCodeBlock() { + @Override + public Object execute(final StackFrame frame) { + final ExecEnv env = frame.getEnv(); + final String propname = (String) frame.getLocal(0, 0); + final Field field = env.findStaticField(EXEC_ENV, propname); + if (field != null) { + field.clear(); + return env; + } + throw new VMException(frame, + String.format("Cannot find property %s::%s", + EMFTVMUtil.toPrettyString(EXEC_ENV, env), propname)); + } + }); + createOperation(false, "refUnsetValue", Types.EXEC_ENV_TYPE, Types.EXEC_ENV_TYPE, + new String[][][]{{{"propname"}, Types.STRING_TYPE}}, + new NativeCodeBlock() { + @Override + public Object execute(final StackFrame frame) { + final ExecEnv env = (ExecEnv) frame.getLocal(0, 0); + final String propname = (String) frame.getLocal(0, 1); + final Field field = env.findStaticField(EXEC_ENV, propname); + if (field != null) { + field.clear(); + return env; + } + throw new VMException(frame, + String.format("Cannot find property %s::%s", + EMFTVMUtil.toPrettyString(EXEC_ENV, env), propname)); + } + }); + createOperation(true, "getEnv", Types.EXEC_ENV_TYPE, Types.EXEC_ENV_TYPE, + new String[][][] {}, + new NativeCodeBlock() { + @Override + public Object execute(final StackFrame frame) { + return frame.getEnv(); + } + }); ///////////////////////////////////////////////////////////////////// // Class ///////////////////////////////////////////////////////////////////// diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/PluginExtensionUtil.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/PluginExtensionUtil.java new file mode 100644 index 00000000..b895972b --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/PluginExtensionUtil.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * 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: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.util; + +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.m2m.atl.emftvm.ModelFactory; + +/** + * Eclipse plug-in extension utility for {@link ModelFactory}. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public interface PluginExtensionUtil { + + /** + * Creates a {@link TypeMap} of {@link Resource} classes/interfaces to + * {@link ModelFactory} instances that can be used for those {@link Resource}s. + * + * @return a {@link TypeMap} of {@link Resource} classes/interfaces to + * {@link ModelFactory} instances + */ + TypeMap<Class<?>, ModelFactory> createModelFactoryRegistry(); + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/PluginExtensionUtilImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/PluginExtensionUtilImpl.java new file mode 100644 index 00000000..8ddf722e --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/PluginExtensionUtilImpl.java @@ -0,0 +1,62 @@ +/******************************************************************************* + * Copyright (c) 2021 Dennis Wagelaar. + * 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: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ +package org.eclipse.m2m.atl.emftvm.util; + +import java.util.logging.Level; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.Platform; +import org.eclipse.m2m.atl.common.ATLLogger; +import org.eclipse.m2m.atl.emftvm.ModelFactory; + +/** + * Implementation for {@link PluginExtensionUtil}. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class PluginExtensionUtilImpl implements PluginExtensionUtil { + + private static final String MODELFACTORY_EXTENSION_POINT = "org.eclipse.m2m.atl.emftvm.modelfactory"; + + /** + * {@inheritDoc} + */ + public TypeMap<Class<?>, ModelFactory> createModelFactoryRegistry() { + final TypeMap<Class<?>, ModelFactory> modelFactoryRegistry = new TypeHashMap<Class<?>, ModelFactory>(); + if (Platform.isRunning()) { + final IExtension[] extensions = Platform.getExtensionRegistry() + .getExtensionPoint(MODELFACTORY_EXTENSION_POINT).getExtensions(); + for (int i = 0; i < extensions.length; i++) { + final IConfigurationElement[] configElements = extensions[i].getConfigurationElements(); + for (int j = 0; j < configElements.length; j++) { + final String resourceType = configElements[j].getAttribute("resourceType"); + if (resourceType != null && resourceType.length() > 0) { + try { + final Class<?> resourceClass = Class.forName(resourceType); + final ModelFactory modelFactory = (ModelFactory) configElements[j] + .createExecutableExtension("class"); + modelFactoryRegistry.put(resourceClass, modelFactory); + } catch (final ClassNotFoundException e) { + ATLLogger.log(Level.WARNING, "Cannot find specified resourceType", e); + } catch (final CoreException e) { + ATLLogger.log(Level.WARNING, "Cannot create instance of specified class", e); + } + } + } + } + } + return modelFactoryRegistry; + } + +} diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ResourceIterable.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ResourceIterable.java index aad307a6..0c93abcc 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ResourceIterable.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/ResourceIterable.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/SingletonModuleResolverFactory.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/SingletonModuleResolverFactory.java index a56b6744..608f623c 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/SingletonModuleResolverFactory.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/SingletonModuleResolverFactory.java @@ -1,9 +1,9 @@ /*******************************************************************************
* Copyright (c) 2013 HealthConnect CVBA.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Dennis Wagelaar, HealthConnect - initial API and
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Stack.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Stack.java index e89b9e6b..9a00378b 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Stack.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Stack.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java index 867af7cf..84bfc134 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TimingData.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TimingData.java index 9b21dca7..70078777 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TimingData.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TimingData.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Tuple.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Tuple.java index eb4ebaf6..edae4cbb 100755 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Tuple.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Tuple.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2017 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TypeHashMap.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TypeHashMap.java index 33c4f31a..067b93ec 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TypeHashMap.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TypeHashMap.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TypeMap.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TypeMap.java index 26df2c96..7c23f02a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TypeMap.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/TypeMap.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Types.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Types.java index 6e65c6ba..17f5bc9a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Types.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/Types.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/VMException.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/VMException.java index ffd44898..31dd1d5e 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/VMException.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/VMException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/VMMonitor.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/VMMonitor.java index 6326d048..e15f3d9d 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/VMMonitor.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/VMMonitor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/WorkspaceUtil.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/WorkspaceUtil.java index c4a8403c..ce715d25 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/WorkspaceUtil.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/WorkspaceUtil.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2012 Dennis Wagelaar. + * Copyright (c) 2012, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -13,17 +13,18 @@ package org.eclipse.m2m.atl.emftvm.util; /** * Eclipse workspace utility. - * + * * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> */ public interface WorkspaceUtil { /** - * Returns the workspace location (absolute path) of <code>path</code> if it is a workspace path, otherwise <code>null</code>. - * - * @param path - * the workspace path - * @return the workspace location (absolute path) of <code>path</code> or <code>null</code> + * Returns the workspace location (absolute path) of <code>path</code> if it is + * a workspace path, otherwise <code>null</code>. + * + * @param path the workspace path + * @return the workspace location (absolute path) of <code>path</code> or + * <code>null</code> */ String getWorkspaceLocation(String path); diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/WorkspaceUtilImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/WorkspaceUtilImpl.java index 7d72867d..045bb31a 100644 --- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/WorkspaceUtilImpl.java +++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/WorkspaceUtilImpl.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/about.html b/plugins/org.eclipse.m2m.atl.engine-feature/about.html index 2b9bcfbe..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.engine-feature/about.html +++ b/plugins/org.eclipse.m2m.atl.engine-feature/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>May 30, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/build.properties b/plugins/org.eclipse.m2m.atl.engine-feature/build.properties index 48bb27d8..a1f75234 100644 --- a/plugins/org.eclipse.m2m.atl.engine-feature/build.properties +++ b/plugins/org.eclipse.m2m.atl.engine-feature/build.properties @@ -1,11 +1,11 @@ bin.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ license.html,\ license.txt src.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ license.html diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/epl-v10.html b/plugins/org.eclipse.m2m.atl.engine-feature/epl-v10.html deleted file mode 100644 index cb1073a4..00000000 --- a/plugins/org.eclipse.m2m.atl.engine-feature/epl-v10.html +++ /dev/null @@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<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=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - 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; - } -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; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@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></p> - -</div> - -</body> - -</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.engine-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.engine-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/feature.properties b/plugins/org.eclipse.m2m.atl.engine-feature/feature.properties index 40d8270d..7e285069 100644 --- a/plugins/org.eclipse.m2m.atl.engine-feature/feature.properties +++ b/plugins/org.eclipse.m2m.atl.engine-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002-2005 ATLAS Group (INRIA & LINA). # * All rights reserved. This program and the accompanying materials -# * are made available under the terms of the Eclipse Public License v1.0 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * ATLAS Group (INRIA & LINA) @@ -29,7 +29,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=ATL Feature +featureName=ATL Runtime # "providerName" property - name of the company that provides the feature providerName=Eclipse.org @@ -37,143 +37,167 @@ providerName=Eclipse.org # "description" property - description of the feature description=ATL Engine -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html +# "updateSiteName" property - label for the update site +ModelingUpdateSiteName=Eclipse Modeling # ============================================================================== # %%% END OF TRANSLATED PROPERTIES %%% # The above properties have been shipped for translation. # ============================================================================== +copyrightURL = copyright.txt +copyright = Copyright (c) 2004, 2009 INRIA. \n\ +All rights reserved. This program and the accompanying materials \n\ +are made available under the terms of the Eclipse Public License v2.0 \n\ +which accompanies this distribution, and is available at \n\ +https://www.eclipse.org/legal/epl-2.0/ \n\ + \n\ + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +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\ -February 1, 2011\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - 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\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - 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\ - - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - 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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ - the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ - extending or updating the functionality of an Eclipse-based product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ - Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ - govern the use of the Installable Software ("Installable Software Agreement") and such\n\ - Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ - with the Specification. Such Installable Software Agreement must inform the user of the\n\ - terms and conditions that govern the Installable Software and must solicit acceptance by\n\ - the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation\n\ - of the Installable Software.\n\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## - - -# "updateSiteName" property - label for the update site -ModelingUpdateSiteName=Eclipse Modeling diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/feature.xml b/plugins/org.eclipse.m2m.atl.engine-feature/feature.xml index 23d7beb2..f0f6010f 100644 --- a/plugins/org.eclipse.m2m.atl.engine-feature/feature.xml +++ b/plugins/org.eclipse.m2m.atl.engine-feature/feature.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.m2m.atl.engine" - label="ATL Engine" - version="2.0.0.qualifier" + label="%featureName" + version="4.10.0.qualifier" provider-name="Eclipse.org"> <description> @@ -14,265 +14,51 @@ <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> </url> - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - /* -* Copyright (c) 2004, INRIA. -* 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 -* -*/ + <copyright url="%copyrightURL"> + %copyright </copyright> - <license url="http://www.eclipse.org/legal/epl-v10.html"> - Eclipse Public License - v 1.0 -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. -1. DEFINITIONS -"Contribution" means: -a) in the case of the initial Contributor, the initial code and -documentation distributed under this Agreement, and -b) in the case of each subsequent Contributor: -i) changes to the Program, and -ii) additions to the Program; -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. -"Contributor" means any person or entity that distributes the -Program. -"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. -"Program" means the Contributions distributed in accordance with -this Agreement. -"Recipient" means anyone who receives the Program under this -Agreement, including all Contributors. -2. GRANT OF RIGHTS -a) Subject to the terms of this Agreement, each Contributor hereby -grants Recipient a non-exclusive, worldwide, royalty-free copyright -license to 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. -b) Subject to the terms of this Agreement, each Contributor hereby -grants Recipient a non-exclusive, worldwide, 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. -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. -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. -3. REQUIREMENTS -A Contributor may choose to distribute the Program in object -code form under its own license agreement, provided that: -a) it complies with the terms and conditions of this Agreement; -and -b) its license agreement: -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; -ii) effectively excludes on behalf of all Contributors all liability -for damages, including direct, indirect, special, incidental -and consequential damages, such as lost profits; -iii) states that any provisions which differ from this Agreement -are offered by that Contributor alone and not by any other party; -and -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. -When the Program is made available in source code form: -a) it must be made available under this Agreement; and -b) a copy of this Agreement must be included with each copy of -the Program. -Contributors may not remove or alter any copyright notices contained -within the Program. -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. -4. COMMERCIAL DISTRIBUTION -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. -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. -5. NO WARRANTY -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. -6. DISCLAIMER OF LIABILITY -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. -7. GENERAL -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. -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. -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. -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. -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. + <license url="%licenseURL"> + %license </license> - <requires> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.emf.ecore"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.emf.ecore.xmi"/> - <import plugin="org.antlr.runtime" version="3.0.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.emf.common"/> - </requires> - <plugin - id="org.eclipse.m2m.atl.engine" + id="org.eclipse.m2m.atl" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.eclipse.m2m.atl.compilers.atl2006" + id="org.eclipse.m2m.atl.common" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.eclipse.m2m.atl.drivers.emf4atl" + id="org.eclipse.m2m.atl.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.eclipse.m2m.atl.engine.vm" + id="org.eclipse.m2m.atl.core.ant" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.eclipse.m2m.atl.ocl.core" + id="org.eclipse.m2m.atl.core.emf" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.eclipse.m2m.atl.service.core" + id="org.eclipse.m2m.atl.drivers.emf4atl" download-size="0" install-size="0" version="0.0.0" @@ -286,7 +72,14 @@ litigation. unpack="false"/> <plugin - id="org.antlr.runtime" + id="org.eclipse.m2m.atl.dsls" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.engine" download-size="0" install-size="0" version="0.0.0" @@ -299,4 +92,18 @@ litigation. version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.m2m.atl.engine.vm" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.antlr.runtime" + download-size="0" + install-size="0" + version="3.2.0.v20230929-1400" + unpack="false"/> + </feature> diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/license.html b/plugins/org.eclipse.m2m.atl.engine-feature/license.html index f19c483b..c35d8345 100644 --- a/plugins/org.eclipse.m2m.atl.engine-feature/license.html +++ b/plugins/org.eclipse.m2m.atl.engine-feature/license.html @@ -21,8 +21,8 @@ <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>. +<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 2.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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 diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/pom.xml b/plugins/org.eclipse.m2m.atl.engine-feature/pom.xml new file mode 100644 index 00000000..7e940914 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.engine-feature/pom.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2012 Obeo. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v2.0 + which accompanies this distribution, and is available at + https://www.eclipse.org/legal/epl-2.0/ + + Contributors: + Obeo - initial creator + --> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>m2m.atl-parent</artifactId> + <groupId>org.eclipse.m2m.atl</groupId> + <version>4.10.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> + </parent> + <groupId>org.eclipse.m2m.atl.features</groupId> + <artifactId>org.eclipse.m2m.atl.engine</artifactId> + <version>4.10.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> + +</project> diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/epl-v10.html b/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/epl-v10.html deleted file mode 100644 index cb1073a4..00000000 --- a/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/epl-v10.html +++ /dev/null @@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<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=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - 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; - } -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; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@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></p> - -</div> - -</body> - -</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/epl-v20.html b/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/notice.html b/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/notice.html index 74122b24..6dde95fa 100644 --- a/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/notice.html +++ b/plugins/org.eclipse.m2m.atl.engine-feature/rootfiles/notice.html @@ -20,8 +20,8 @@ <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>. +<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 2.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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.org CVS repository ("Repository") in CVS diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/META-INF/MANIFEST.MF index ca7b084f..9ea86398 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.engine.emfvm.launch;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.m2m.atl.engine.emfvm;visibility:=reexport, diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/about.html b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/about.html index b6380d4b..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/about.html +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>September 1, 2005</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/pom.xml b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/pom.xml index 2925416d..2e64c53f 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine.emfvm.launch</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/EMFVMUILauncher.java b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/EMFVMUILauncher.java index 6171949e..1ccccd58 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/EMFVMUILauncher.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/EMFVMUILauncher.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/ADWPDebuggee.java b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/ADWPDebuggee.java index 4cb40086..3c701a6e 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/ADWPDebuggee.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/ADWPDebuggee.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/LocalObjectReference.java b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/LocalObjectReference.java index f3b8081c..9c38b2ab 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/LocalObjectReference.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/LocalObjectReference.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/NetworkDebugger.java b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/NetworkDebugger.java index 01167cc5..1383e9f3 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/NetworkDebugger.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm.launch/src/org/eclipse/m2m/atl/engine/emfvm/launch/debug/NetworkDebugger.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.engine.emfvm/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.engine.emfvm/META-INF/MANIFEST.MF index fcdb1e17..1b498a83 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.engine.emfvm;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ClassPath: . diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/about.html b/plugins/org.eclipse.m2m.atl.engine.emfvm/about.html index 81b672dd..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/about.html +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 26, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.engine.emfvm/deploy/release/pom.xml index 39ff6d6f..055773db 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine.emfvm</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.engine.emfvm/deploy/snapshot/pom.xml index 11b15d66..4e9c6a45 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine.emfvm</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/pom.xml b/plugins/org.eclipse.m2m.atl.engine.emfvm/pom.xml index 5a999c0a..0c03f3a8 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine.emfvm</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASM.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASM.java index 0c4191a0..aed34cbb 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASM.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASM.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMOperation.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMOperation.java index 9932bc35..54699516 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMOperation.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMOperation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMXMLReader.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMXMLReader.java index eaea5402..5ae269af 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMXMLReader.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMXMLReader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMXMLReaderException.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMXMLReaderException.java index 2155d38a..a102a4a5 100755 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMXMLReaderException.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/ASMXMLReaderException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/AtlSuperimposeModule.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/AtlSuperimposeModule.java index 4940f75f..b82d7f3a 100755 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/AtlSuperimposeModule.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/AtlSuperimposeModule.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar (Vrije Universiteit Brussel) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/Bytecode.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/Bytecode.java index c811e135..4b45bbe7 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/Bytecode.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/Bytecode.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/Messages.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/Messages.java index a102bf3f..b1474d2c 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/Messages.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/StackFrame.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/StackFrame.java index a0b6d605..6b326f31 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/StackFrame.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/StackFrame.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/VMException.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/VMException.java index 660fd089..c01f4ec7 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/VMException.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/VMException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/EMFModelAdapter.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/EMFModelAdapter.java index 72f351e8..c999adeb 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/EMFModelAdapter.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/EMFModelAdapter.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/IModelAdapter.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/IModelAdapter.java index 4a1daefa..5fba2576 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/IModelAdapter.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/IModelAdapter.java @@ -1,9 +1,9 @@ /** * Copyright (c) 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/UML2ModelAdapter.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/UML2ModelAdapter.java index 76b71ef1..b60b9ea0 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/UML2ModelAdapter.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/adapter/UML2ModelAdapter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/launch/EMFVMLauncher.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/launch/EMFVMLauncher.java index c883c3ad..7ad102d2 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/launch/EMFVMLauncher.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/launch/EMFVMLauncher.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/launch/ITool.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/launch/ITool.java index 6c097553..a3fb7841 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/launch/ITool.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/launch/ITool.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/ASMModule.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/ASMModule.java index a630c20a..e816cc81 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/ASMModule.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/ASMModule.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/AbstractStackFrame.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/AbstractStackFrame.java index 95b5494f..56752468 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/AbstractStackFrame.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/AbstractStackFrame.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Bag.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Bag.java index 41f3ba52..41d9fe44 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Bag.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Bag.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - bag implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/EnumLiteral.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/EnumLiteral.java index c9a250d8..d56034db 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/EnumLiteral.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/EnumLiteral.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/ExecEnv.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/ExecEnv.java index 7c8de483..72229cce 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/ExecEnv.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/ExecEnv.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2008 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation @@ -1245,7 +1245,8 @@ public class ExecEnv { boolean ret = true; Collection<?> s = (Collection<?>)localVars[0]; for (Iterator<?> i = ((Collection<?>)localVars[1]).iterator(); i.hasNext();) { - ret = ret && !s.contains(i.next()); + Object next = i.next(); + ret = ret && !s.contains(next); } return Boolean.valueOf(ret); } diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/HasFields.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/HasFields.java index 04aac30a..3debc16e 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/HasFields.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/HasFields.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/LibExtension.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/LibExtension.java index 60e9dcfa..ad6bf202 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/LibExtension.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/LibExtension.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclParametrizedType.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclParametrizedType.java index 9c3f7062..046b236d 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclParametrizedType.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclParametrizedType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclSimpleType.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclSimpleType.java index 1e721519..2f86158b 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclSimpleType.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclSimpleType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclType.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclType.java index cfc9a4c0..9081ed58 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclType.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclUndefined.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclUndefined.java index ecd66589..1d3cae0b 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclUndefined.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclUndefined.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Operation.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Operation.java index 5216fb77..68646674 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Operation.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Operation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/TransientLink.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/TransientLink.java index 7af0d133..0cffee55 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/TransientLink.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/TransientLink.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/TransientLinkSet.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/TransientLinkSet.java index 42c66949..1cc7aa90 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/TransientLinkSet.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/TransientLinkSet.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Tuple.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Tuple.java index 097f05aa..24cce15c 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Tuple.java +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/Tuple.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/package.html b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/package.html index f7f3f2ad..1b01b744 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/package.html +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/package.html @@ -6,9 +6,9 @@ /****************************************************************************** * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - documentation diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/messages.properties b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/messages.properties index 137f3dc8..0698d68c 100644 --- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/messages.properties +++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.engine.vm/META-INF/MANIFEST.MF index 78a5b515..1e369760 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.engine.vm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.engine.vm;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Activator: org.eclipse.m2m.atl.engine.vm.ATLVMPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/about.html b/plugins/org.eclipse.m2m.atl.engine.vm/about.html index b6380d4b..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/about.html +++ b/plugins/org.eclipse.m2m.atl.engine.vm/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>September 1, 2005</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.engine.vm/deploy/release/pom.xml index 714d4455..95e263a8 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine.vm/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine.vm</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.engine.vm/deploy/snapshot/pom.xml index f15188b1..dee5541b 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine.vm/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine.vm</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/pom.xml b/plugins/org.eclipse.m2m.atl.engine.vm/pom.xml index e369aeec..70373ab5 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine.vm/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine.vm</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/extractors/Extractor.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/extractors/Extractor.java index a8eb37c1..a6e77ff7 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/extractors/Extractor.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/extractors/Extractor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/extractors/xml/XMLExtractor.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/extractors/xml/XMLExtractor.java index a1692c08..57efc0d1 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/extractors/xml/XMLExtractor.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/extractors/xml/XMLExtractor.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/Injector.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/Injector.java index 7633d28a..29e3a9da 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/Injector.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/Injector.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004, 2014 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/xml/ProtectedHandler.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/xml/ProtectedHandler.java index f7958d03..c7984d77 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/xml/ProtectedHandler.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/xml/ProtectedHandler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/xml/XMLInjector.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/xml/XMLInjector.java index 98ff82b8..20b5d198 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/xml/XMLInjector.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/injectors/xml/XMLInjector.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreter.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreter.java index 8c78963f..c71d343c 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreter.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreterException.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreterException.java index 9cda4f31..e6d9eb49 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreterException.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreterException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASM.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASM.java index 14efa8e7..dfe2f6e7 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASM.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASM.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMEmitter.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMEmitter.java index 8d6165cd..dacce11d 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMEmitter.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMEmitter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMEngine.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMEngine.java index 2f30bf44..47dc741a 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMEngine.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMEngine.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMExecEnv.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMExecEnv.java index 8fee1a82..6bf2b4d7 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMExecEnv.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMExecEnv.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMField.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMField.java index f0f0fe17..adb3d445 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMField.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMField.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInstruction.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInstruction.java index 5da6ce63..6b2907b9 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInstruction.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInstruction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInstructionWithOperand.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInstructionWithOperand.java index b83f1afe..441163d7 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInstructionWithOperand.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInstructionWithOperand.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreter.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreter.java index 43592568..af60b4ca 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreter.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreterException.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreterException.java index e60b7a9d..9e9f87ff 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreterException.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreterException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMOperation.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMOperation.java index 2da927e8..1654d1f4 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMOperation.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMOperation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMParameter.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMParameter.java index 99f457ba..3ef4c608 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMParameter.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMParameter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMProjector.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMProjector.java index 0fab6e76..f6b08445 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMProjector.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMProjector.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMReader.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMReader.java index b104c9b6..062d45b0 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMReader.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMReader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMStackFrame.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMStackFrame.java index 31ee7713..32921fc0 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMStackFrame.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMStackFrame.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMTextualWriter.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMTextualWriter.java index 2762efae..b61f6fdc 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMTextualWriter.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMTextualWriter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMWriter.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMWriter.java index 1b442dd4..2664893c 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMWriter.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMWriter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLReader.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLReader.java index df12958c..849eedc6 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLReader.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLReader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLReaderException.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLReaderException.java index 79ff3759..ab15bc58 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLReaderException.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLReaderException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLWriter.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLWriter.java index c659a477..af398cb6 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLWriter.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMXMLWriter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ATLVMPlugin.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ATLVMPlugin.java index 311ecc7a..b67105e0 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ATLVMPlugin.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ATLVMPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ATLVMTools.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ATLVMTools.java index 86e37141..47640611 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ATLVMTools.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ATLVMTools.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlLauncher.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlLauncher.java index c6dea637..bcca7f19 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlLauncher.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlLauncher.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlModelHandler.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlModelHandler.java index 6cd382fe..10f44efa 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlModelHandler.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlModelHandler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlSuperimposeModule.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlSuperimposeModule.java index a6142c70..bf532875 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlSuperimposeModule.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlSuperimposeModule.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004-2008 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar (Vrije Universiteit Brussel) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlVMMessages.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlVMMessages.java index d4c50e7c..62e5d29f 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlVMMessages.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/AtlVMMessages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ClassNativeOperation.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ClassNativeOperation.java index 9b7b2d94..a0c40af9 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ClassNativeOperation.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ClassNativeOperation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/Debugger.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/Debugger.java index a106c156..73dabd89 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/Debugger.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/Debugger.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/DummyDebugger.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/DummyDebugger.java index 6f1e2c4d..1dcadefe 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/DummyDebugger.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/DummyDebugger.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ExecEnv.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ExecEnv.java index 8ccc03b3..67fac31a 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ExecEnv.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ExecEnv.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/InstanceNativeOperation.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/InstanceNativeOperation.java index 2f63b1e4..8f850098 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/InstanceNativeOperation.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/InstanceNativeOperation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ModelLoader.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ModelLoader.java index 38ee432f..39e77c8e 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ModelLoader.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ModelLoader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/NativeOperation.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/NativeOperation.java index 10d52208..05ba2e32 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/NativeOperation.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/NativeOperation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/NativeStackFrame.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/NativeStackFrame.java index b2793c44..04b215ee 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/NativeStackFrame.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/NativeStackFrame.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/Operation.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/Operation.java index 7c2b3d19..d6055acb 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/Operation.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/Operation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/PluginClassLoader.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/PluginClassLoader.java index 33ec432e..ecec7462 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/PluginClassLoader.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/PluginClassLoader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/SimpleDebugger.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/SimpleDebugger.java index bc9b0d50..fd7bb9ce 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/SimpleDebugger.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/SimpleDebugger.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/StackFrame.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/StackFrame.java index 1310c241..aef9b9a4 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/StackFrame.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/StackFrame.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/VMException.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/VMException.java index 1709a7c1..25511cb9 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/VMException.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/VMException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/messages.properties b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/messages.properties index e7f5e335..c1815a65 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/messages.properties +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/AMN.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/AMN.java index 5031da90..ffb3ccdf 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/AMN.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/AMN.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMBag.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMBag.java index 41ed2a69..89a76214 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMBag.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMBag.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMBoolean.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMBoolean.java index 3a3a3c66..96bc7b23 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMBoolean.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMBoolean.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMCollection.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMCollection.java index c76ff1d6..9e54f873 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMCollection.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMCollection.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMEnumLiteral.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMEnumLiteral.java index b327e2ac..74765275 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMEnumLiteral.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMEnumLiteral.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMHashModel.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMHashModel.java index fb334d24..e94b062e 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMHashModel.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMHashModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMHashModelElement.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMHashModelElement.java index 56c8d49a..918dbb73 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMHashModelElement.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMHashModelElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMInteger.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMInteger.java index d7341e33..96bc6df1 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMInteger.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMInteger.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMMap.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMMap.java index 3c1405f4..7b2f5b45 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMMap.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMMap.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModel.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModel.java index abef9b3d..ecbddad6 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModel.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModel.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModelElement.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModelElement.java index 325f462a..54b88bdc 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModelElement.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModelElement.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModelNavigationException.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModelNavigationException.java index c46e41b1..486434a3 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModelNavigationException.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModelNavigationException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModule.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModule.java index cc8a88ff..9e3e4074 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModule.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMModule.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMNativeObject.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMNativeObject.java index 73970ca2..84a00c3e 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMNativeObject.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMNativeObject.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMNumber.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMNumber.java index 45bfd257..14e8d01c 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMNumber.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMNumber.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclAny.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclAny.java index e6e2e108..ec4599ca 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclAny.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclAny.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclParametrizedType.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclParametrizedType.java index cd105c28..3cf8b6c0 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclParametrizedType.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclParametrizedType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclSimpleType.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclSimpleType.java index 83e5e97d..3cad084b 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclSimpleType.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclSimpleType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclType.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclType.java index b82bc06d..9b2a8def 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclType.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclUndefined.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclUndefined.java index 6cb1aea2..b62d6302 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclUndefined.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOclUndefined.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOrderedSet.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOrderedSet.java index 8e5459ce..1fd99f75 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOrderedSet.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMOrderedSet.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMReal.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMReal.java index b5d15723..ef52af97 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMReal.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMReal.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMSequence.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMSequence.java index 84d542ae..73f8c258 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMSequence.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMSequence.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMSet.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMSet.java index 4601a344..c4ef914e 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMSet.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMSet.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMString.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMString.java index 1bbdb54e..489ff5f3 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMString.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMString.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation @@ -72,7 +72,7 @@ public class ASMString extends ASMOclAny { ret.append("\\b"); } else if (c == '\f') { ret.append("\\f"); - } else if ((c < ' ') || ((c > '~') && (c < '¡'))) { + } else if ((c < ' ') || ((c > '~') && (c < '¡'))) { ret.append("\\"); if (c < 010) { ret.append("0"); diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTransientLink.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTransientLink.java index 90ef6259..9c9cc59f 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTransientLink.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTransientLink.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTransientLinkSet.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTransientLinkSet.java index 210670d1..596d33f1 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTransientLinkSet.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTransientLinkSet.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTuple.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTuple.java index 7987ceef..961940f5 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTuple.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTuple.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTupleType.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTupleType.java index 4b4ea4dc..ad45c610 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTupleType.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/ASMTupleType.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/SOTSExpression2.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/SOTSExpression2.java index a08e400f..b18d6752 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/SOTSExpression2.java +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/SOTSExpression2.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/package.html b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/package.html index 68e4ece6..ec821067 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/package.html +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/nativelib/package.html @@ -6,9 +6,9 @@ /****************************************************************************** * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - documentation diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/package.html b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/package.html index 6672147f..87a72e3e 100644 --- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/package.html +++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/package.html @@ -6,9 +6,9 @@ /****************************************************************************** * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - documentation diff --git a/plugins/org.eclipse.m2m.atl.engine/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.engine/META-INF/MANIFEST.MF index 0b753662..3b9ff321 100644 --- a/plugins/org.eclipse.m2m.atl.engine/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.engine/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.engine; singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.m2m.atl.engine/about.html b/plugins/org.eclipse.m2m.atl.engine/about.html index 9d9e5a6e..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.engine/about.html +++ b/plugins/org.eclipse.m2m.atl.engine/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 5, 2004</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.engine/deploy/release/pom.xml b/plugins/org.eclipse.m2m.atl.engine/deploy/release/pom.xml index a71ba160..8e2aa0d9 100644 --- a/plugins/org.eclipse.m2m.atl.engine/deploy/release/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine/deploy/release/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine</artifactId> - <version>4.0.0-1</version> + <version>4.10.0</version> <packaging>jar</packaging> <licenses> <license> @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.eclipse.m2m.atl</groupId> - <artifactId>org.eclipse.m2m.atl.emfvm</artifactId> + <artifactId>org.eclipse.m2m.atl.engine.emfvm</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/plugins/org.eclipse.m2m.atl.engine/deploy/snapshot/pom.xml b/plugins/org.eclipse.m2m.atl.engine/deploy/snapshot/pom.xml index 7c79a53c..79c36304 100644 --- a/plugins/org.eclipse.m2m.atl.engine/deploy/snapshot/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine/deploy/snapshot/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>jar</packaging> <licenses> <license> @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.eclipse.m2m.atl</groupId> - <artifactId>org.eclipse.m2m.atl.emfvm</artifactId> + <artifactId>org.eclipse.m2m.atl.engine.emfvm</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/plugins/org.eclipse.m2m.atl.engine/pom.xml b/plugins/org.eclipse.m2m.atl.engine/pom.xml index b490ce22..ec79af75 100644 --- a/plugins/org.eclipse.m2m.atl.engine/pom.xml +++ b/plugins/org.eclipse.m2m.atl.engine/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.engine</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -57,8 +57,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId> <url>${project.distributionManagement.snapshotRepository.url}</url> <groupId>${project.groupId}</groupId> @@ -95,8 +94,7 @@ </goals> <configuration> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> - <files>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</files> - <classifiers>sources</classifiers> + <sources>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</sources> <repositoryId>${project.distributionManagement.repository.id}</repositoryId> <url>${project.distributionManagement.repository.url}</url> <groupId>${project.groupId}</groupId> diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/MarkerMaker.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/MarkerMaker.java index 909f50d2..0e11dd6d 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/MarkerMaker.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/MarkerMaker.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Tarik Idrissi (INRIA) - initial API and implementation @@ -79,28 +79,35 @@ public class MarkerMaker { String description = (String)problem.eGet(sfDescription); String location = (String)problem.eGet(sfLocation); - String[] parts = location.split("-")[0].split(":"); //$NON-NLS-1$ //$NON-NLS-2$ - int lineNumber = Integer.parseInt(parts[0]); - int columnNumber = Integer.parseInt(parts[1]); + final String[] parts = location.split("-")[0].split(":"); //$NON-NLS-1$ //$NON-NLS-2$ + int lineNumber; + int columnNumber; + try { + lineNumber = Integer.parseInt(parts[0]); + columnNumber = Integer.parseInt(parts[1]); + } catch (final NumberFormatException e) { + lineNumber = 1; + columnNumber = 1; + } int charStart = 0; int charEnd = 0; try { if (location.indexOf('-') == -1) { location += '-' + location; } - int[] pos = help.getIndexChar(location, tabWidth); + final int[] pos = help.getIndexChar(location, tabWidth); charStart = pos[0]; charEnd = pos[1]; - } catch (Exception e) { + } catch (final Exception e) { description += " [location \"" + location + "\" incorrectly reported because of error]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-1$//$NON-NLS-2$ } - String severity = ((Enumerator)problem.eGet(sfSeverity)).getName(); - int eclipseSeverity = ((Integer)severities.get(severity)).intValue(); + final String severity = ((Enumerator)problem.eGet(sfSeverity)).getName(); + final int eclipseSeverity = ((Integer)severities.get(severity)).intValue(); try { - IMarker pbmMarker = res.createMarker(PROBLEM_MARKER); + final IMarker pbmMarker = res.createMarker(PROBLEM_MARKER); pbmMarker.setAttribute(IMarker.SEVERITY, eclipseSeverity); pbmMarker.setAttribute(IMarker.MESSAGE, description); pbmMarker.setAttribute(IMarker.LINE_NUMBER, lineNumber); @@ -108,18 +115,18 @@ public class MarkerMaker { new Object[] {new Integer(lineNumber), new Integer(columnNumber)})); pbmMarker.setAttribute(IMarker.CHAR_START, charStart); pbmMarker.setAttribute(IMarker.CHAR_END, (charEnd > charStart) ? charEnd : charStart + 1); - } catch (CoreException e) { + } catch (final CoreException e) { ATLLogger.log(Level.SEVERE, e.getLocalizedMessage(), e); } } private void createPbmMarkers(IResource res, EObject[] eos, int tabWidth) { try { - AtlNbCharFile help = new AtlNbCharFile(((IFile)res).getContents()); + final AtlNbCharFile help = new AtlNbCharFile(((IFile)res).getContents()); for (int i = 0; i < eos.length; i++) { eObjectToPbmMarker(res, help, eos[i], tabWidth); } - } catch (CoreException e1) { + } catch (final CoreException e1) { ATLLogger.log(Level.SEVERE, e1.getLocalizedMessage(), e1); } @@ -140,12 +147,12 @@ public class MarkerMaker { private void resetPbmMarkers(final IResource res, final EObject[] eos, final int tabWidth) throws CoreException { - IWorkspaceRunnable r = new IWorkspaceRunnable() { + final IWorkspaceRunnable r = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { synchronized (res) { try { res.deleteMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE); - } catch (CoreException e) { + } catch (final CoreException e) { ATLLogger.log(Level.SEVERE, e.getLocalizedMessage(), e); } createPbmMarkers(res, eos, tabWidth); @@ -185,14 +192,14 @@ public class MarkerMaker { private int applyMarkers(IFile file, IModel pbs, int tabWidth) throws CoreException { int nbErrors = 0; - Object problemType = AtlParser.getDefault().getProblemMetamodel().getMetaElementByName("Problem"); - Collection pbsc = pbs.getElementsByType(problemType); //$NON-NLS-1$ - EObject[] pbsa = new EObject[pbsc.size()]; + final Object problemType = AtlParser.getDefault().getProblemMetamodel().getMetaElementByName("Problem"); + final Collection pbsc = pbs.getElementsByType(problemType); //$NON-NLS-1$ + final EObject[] pbsa = new EObject[pbsc.size()]; int k = 0; - for (Iterator i = pbsc.iterator(); i.hasNext();) { - EObject ame = (EObject)i.next(); + for (final Iterator i = pbsc.iterator(); i.hasNext();) { + final EObject ame = (EObject)i.next(); pbsa[k] = ame; - EStructuralFeature severityFeature = ame.eClass().getEStructuralFeature("severity"); //$NON-NLS-1$ + final EStructuralFeature severityFeature = ame.eClass().getEStructuralFeature("severity"); //$NON-NLS-1$ if ("error".equals(((Enumerator)ame.eGet(severityFeature)).getName())) { //$NON-NLS-1$ nbErrors++; } diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/Messages.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/Messages.java index 4486a38d..4d1831fd 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/Messages.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ProblemConverter.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ProblemConverter.java index 7a75cf72..e0df8157 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ProblemConverter.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ProblemConverter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Matthias Bohlen - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASM.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASM.java index 87d95550..e4ab3883 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASM.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASM.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMEmitter.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMEmitter.java index a7937568..ea2f72d2 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMEmitter.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMEmitter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMEmitterException.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMEmitterException.java index af99e339..900b6eb8 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMEmitterException.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMEmitterException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMField.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMField.java index 3aa04d38..a7a23aa4 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMField.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMField.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMInstruction.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMInstruction.java index 819721e0..ffd880a6 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMInstruction.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMInstruction.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMInstructionWithOperand.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMInstructionWithOperand.java index 0c6d06ae..4ed4bf82 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMInstructionWithOperand.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMInstructionWithOperand.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMOperation.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMOperation.java index f42c38e0..21cbd3e5 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMOperation.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMOperation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMParameter.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMParameter.java index f432557c..58224d3c 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMParameter.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMParameter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMTextualWriter.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMTextualWriter.java index f447dc5d..8884d0f3 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMTextualWriter.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMTextualWriter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMWriter.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMWriter.java index 4f0f3b20..e5d64b6b 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMWriter.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMWriter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMXMLWriter.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMXMLWriter.java index a2c93539..05325a90 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMXMLWriter.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/ASMXMLWriter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/lib/SOTSExpression2.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/lib/SOTSExpression2.java index 6e58d336..dd8862c2 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/lib/SOTSExpression2.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/asm/lib/SOTSExpression2.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/Atl2004Compiler.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/Atl2004Compiler.java index bf5cb757..9606b38d 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/Atl2004Compiler.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/Atl2004Compiler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlCompiler.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlCompiler.java index 2bc83969..135e2739 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlCompiler.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlCompiler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004, 2014 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlDefaultCompiler.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlDefaultCompiler.java index ea039e7d..f2c8d5e7 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlDefaultCompiler.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlDefaultCompiler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004, 2014 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlStandaloneCompiler.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlStandaloneCompiler.java index 85936d48..149f4aa0 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlStandaloneCompiler.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/AtlStandaloneCompiler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004, 2014 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Matthias Bohlen - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/CompileTimeError.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/CompileTimeError.java index 7afc3b9a..0b42b157 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/CompileTimeError.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/CompileTimeError.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Matthias Bohlen - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/CompilerNotFoundException.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/CompilerNotFoundException.java index 7202e9d3..dfe7f698 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/CompilerNotFoundException.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/CompilerNotFoundException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Matthias Bohlen - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/atl2006/Atl2006Compiler.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/atl2006/Atl2006Compiler.java index d8dce4fe..ac469442 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/atl2006/Atl2006Compiler.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/atl2006/Atl2006Compiler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/atl2010/Atl2010InPlace.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/atl2010/Atl2010InPlace.java index 356fe716..fbe8674e 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/atl2010/Atl2010InPlace.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/compiler/atl2010/Atl2010InPlace.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2010 INRIA and other. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * INRIA - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/messages.properties b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/messages.properties index 847ab3f1..7acd8737 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/messages.properties +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclEvaluator.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclEvaluator.java index 6bf7c859..65367601 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclEvaluator.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclEvaluator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclHelper.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclHelper.java index b509b16b..64a37e53 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclHelper.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclHelper.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclQuery.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclQuery.java index 3a061ef0..fbd9e38c 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclQuery.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/ocl/OclQuery.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Frederic Jouault (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/package.html b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/package.html index f7d5997a..982ccf45 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/package.html +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/package.html @@ -6,9 +6,9 @@ /****************************************************************************** * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - documentation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/parser/AtlParser.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/parser/AtlParser.java index 0827b90d..23e98ce7 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/parser/AtlParser.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/parser/AtlParser.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/parser/AtlSourceManager.java b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/parser/AtlSourceManager.java index 99839e5f..41cda4d4 100644 --- a/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/parser/AtlSourceManager.java +++ b/plugins/org.eclipse.m2m.atl.engine/src/org/eclipse/m2m/atl/engine/parser/AtlSourceManager.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler-feature/about.html b/plugins/org.eclipse.m2m.atl.profiler-feature/about.html index 2b9bcfbe..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.profiler-feature/about.html +++ b/plugins/org.eclipse.m2m.atl.profiler-feature/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>May 30, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.profiler-feature/build.properties b/plugins/org.eclipse.m2m.atl.profiler-feature/build.properties index c81d36c3..ddb3b2c9 100644 --- a/plugins/org.eclipse.m2m.atl.profiler-feature/build.properties +++ b/plugins/org.eclipse.m2m.atl.profiler-feature/build.properties @@ -3,9 +3,9 @@ bin.includes = feature.properties,\ feature.xml,\ license.html,\ modeling32.png,\ - epl-v10.html + epl-v20.html src.includes = license.html,\ feature.xml,\ feature.properties,\ - epl-v10.html,\ + epl-v20.html,\ modeling32.png diff --git a/plugins/org.eclipse.m2m.atl.profiler-feature/copyright.txt b/plugins/org.eclipse.m2m.atl.profiler-feature/copyright.txt index c1c277ba..e2278e87 100644 --- a/plugins/org.eclipse.m2m.atl.profiler-feature/copyright.txt +++ b/plugins/org.eclipse.m2m.atl.profiler-feature/copyright.txt @@ -1,5 +1,5 @@ Copyright (c) 2008,2009 C-S. All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html
\ No newline at end of file +https://www.eclipse.org/legal/epl-2.0/
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.profiler-feature/epl-v10.html b/plugins/org.eclipse.m2m.atl.profiler-feature/epl-v10.html deleted file mode 100644 index f957f3e7..00000000 --- a/plugins/org.eclipse.m2m.atl.profiler-feature/epl-v10.html +++ /dev/null @@ -1,259 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- saved from url=(0041)http://www.eclipse.org/legal/epl-v10.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -<style type="text/css"></style></head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to 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.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - - - -</body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.profiler-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.profiler-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.profiler-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.profiler-feature/feature.properties b/plugins/org.eclipse.m2m.atl.profiler-feature/feature.properties index 2e5f1e77..9230f3f3 100644 --- a/plugins/org.eclipse.m2m.atl.profiler-feature/feature.properties +++ b/plugins/org.eclipse.m2m.atl.profiler-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2007 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 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * IBM - Initial API and implementation @@ -37,9 +37,9 @@ description = The ATL Profiler. copyrightURL=copyright.txt copyright=Copyright (c) 2008,2009 C-S.\n\ All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ # "updateSiteName" property - label for the update site ModelingUpdateSiteName=Eclipse Modeling @@ -52,126 +52,143 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 9, 2014\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## - diff --git a/plugins/org.eclipse.m2m.atl.profiler-feature/feature.xml b/plugins/org.eclipse.m2m.atl.profiler-feature/feature.xml index 201e1a5b..d43284a4 100644 --- a/plugins/org.eclipse.m2m.atl.profiler-feature/feature.xml +++ b/plugins/org.eclipse.m2m.atl.profiler-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.m2m.atl.profiler" label="%featureName" - version="4.1.0.qualifier" + version="4.10.0.qualifier" provider-name="%providerName"> <description> @@ -20,24 +20,6 @@ <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> </url> - <requires> - <import plugin="org.eclipse.m2m.atl.engine.vm"/> - <import plugin="org.eclipse.m2m.atl.adt.editor"/> - <import plugin="org.eclipse.jface"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.emf.ecore"/> - <import plugin="org.eclipse.emf.edit"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.emf"/> - <import plugin="org.eclipse.emf.edit.ui"/> - <import plugin="org.eclipse.m2m.atl.adt.debug"/> - <import plugin="org.eclipse.debug.core"/> - <import plugin="org.eclipse.m2m.atl.engine"/> - <import plugin="org.eclipse.m2m.atl.profiler.exportmodel"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.m2m.atl.engine.emfvm"/> - </requires> - <plugin id="org.eclipse.m2m.atl.profiler.core" download-size="0" diff --git a/plugins/org.eclipse.m2m.atl.profiler-feature/license.html b/plugins/org.eclipse.m2m.atl.profiler-feature/license.html index cecf137d..afb2f35c 100644 --- a/plugins/org.eclipse.m2m.atl.profiler-feature/license.html +++ b/plugins/org.eclipse.m2m.atl.profiler-feature/license.html @@ -1,106 +1,190 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<?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> -<style type="text/css"></style></head> +</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>
\ No newline at end of file + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/plugins/org.eclipse.m2m.atl.profiler-feature/pom.xml b/plugins/org.eclipse.m2m.atl.profiler-feature/pom.xml index c2ab10c3..44bb2a27 100644 --- a/plugins/org.eclipse.m2m.atl.profiler-feature/pom.xml +++ b/plugins/org.eclipse.m2m.atl.profiler-feature/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl.features</groupId> <artifactId>org.eclipse.m2m.atl.profiler</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.profiler.core/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.profiler.core/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.profiler.core/META-INF/MANIFEST.MF index f68de61d..875a518e 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.profiler.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.profiler.core -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ClassPath: . diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/about.html b/plugins/org.eclipse.m2m.atl.profiler.core/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/about.html +++ b/plugins/org.eclipse.m2m.atl.profiler.core/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/pom.xml b/plugins/org.eclipse.m2m.atl.profiler.core/pom.xml index a01318e7..286e0182 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/pom.xml +++ b/plugins/org.eclipse.m2m.atl.profiler.core/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.profiler.core</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ASMConstants.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ASMConstants.java index 31b4296f..cef4c928 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ASMConstants.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ASMConstants.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ATLModelHandler.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ATLModelHandler.java index 604fc7f1..117e3ac0 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ATLModelHandler.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ATLModelHandler.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ATLProfiler.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ATLProfiler.java index 6d22f213..56e5d051 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ATLProfiler.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ATLProfiler.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/Messages.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/Messages.java index 03ecf7b7..353f8101 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/Messages.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ProfilerModelHandler.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ProfilerModelHandler.java index 9044bbec..dbe9e47a 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ProfilerModelHandler.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/ProfilerModelHandler.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/exception/InterceptedLeavingStackFrameException.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/exception/InterceptedLeavingStackFrameException.java index 4c5cdfcb..a1ade00f 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/exception/InterceptedLeavingStackFrameException.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/exception/InterceptedLeavingStackFrameException.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/exception/NoRegisteredOperationFoundException.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/exception/NoRegisteredOperationFoundException.java index 93ad208b..05476963 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/exception/NoRegisteredOperationFoundException.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/exception/NoRegisteredOperationFoundException.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/messages.properties b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/messages.properties index d8547178..b92531cd 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/messages.properties +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/util/ProfilerModelExporter.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/util/ProfilerModelExporter.java index 100d110f..560d28e7 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/util/ProfilerModelExporter.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/util/ProfilerModelExporter.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/util/ProfilingModelUtils.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/util/ProfilingModelUtils.java index 176a2544..5a4965fc 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/util/ProfilingModelUtils.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/util/ProfilingModelUtils.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/vm/IOperation.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/vm/IOperation.java index e7b587f1..e9833e21 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/vm/IOperation.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/vm/IOperation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/vm/IStackFrame.java b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/vm/IStackFrame.java index 9900b35a..33d0b77a 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/vm/IStackFrame.java +++ b/plugins/org.eclipse.m2m.atl.profiler.core/src/org/eclipse/m2m/atl/profiler/core/vm/IStackFrame.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.emfvm/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.profiler.emfvm/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.emfvm/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.profiler.emfvm/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.profiler.emfvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.profiler.emfvm/META-INF/MANIFEST.MF index 1fa1503e..bdbf67a0 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.emfvm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.profiler.emfvm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.profiler.emfvm;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.m2m.atl.profiler.emfvm/about.html b/plugins/org.eclipse.m2m.atl.profiler.emfvm/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.emfvm/about.html +++ b/plugins/org.eclipse.m2m.atl.profiler.emfvm/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.profiler.emfvm/pom.xml b/plugins/org.eclipse.m2m.atl.profiler.emfvm/pom.xml index 6c88759d..a2ff340a 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.emfvm/pom.xml +++ b/plugins/org.eclipse.m2m.atl.profiler.emfvm/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.profiler.emfvm</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/ProfilerLauncher.java b/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/ProfilerLauncher.java index 3b79373b..1e99986b 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/ProfilerLauncher.java +++ b/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/ProfilerLauncher.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/ProfilingTool.java b/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/ProfilingTool.java index fb33b14d..eafb6853 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/ProfilingTool.java +++ b/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/ProfilingTool.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/adapter/OperationAdapter.java b/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/adapter/OperationAdapter.java index 6edb579b..5fe86c03 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/adapter/OperationAdapter.java +++ b/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/adapter/OperationAdapter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/adapter/StackFrameAdapter.java b/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/adapter/StackFrameAdapter.java index a407792a..9558f1da 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/adapter/StackFrameAdapter.java +++ b/plugins/org.eclipse.m2m.atl.profiler.emfvm/src/org/eclipse/m2m/atl/profiler/emfvm/adapter/StackFrameAdapter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/META-INF/MANIFEST.MF index e85a34a9..e78ea1f3 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.profiler.exportmodel.editor;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.m2m.atl.profiler.exportmodel.presentation.ExportmodelEditorPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/about.html b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/about.html +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/pom.xml b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/pom.xml index 3d9b0607..e4ac584d 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/pom.xml +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.profiler.exportmodel.editor</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelActionBarContributor.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelActionBarContributor.java index 851d6f7e..5afc558d 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelActionBarContributor.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelActionBarContributor.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelEditor.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelEditor.java index 167d1272..f12afa9a 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelEditor.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelEditor.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelEditorPlugin.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelEditorPlugin.java index fddeebe7..6ed930d0 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelEditorPlugin.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelEditorPlugin.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelModelWizard.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelModelWizard.java index d0b3a1b6..ab316f8e 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelModelWizard.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel.editor/src/org/eclipse/m2m/atl/profiler/exportmodel/presentation/ExportmodelModelWizard.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/META-INF/MANIFEST.MF index 6bcbb4cf..f9d3ef3f 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.profiler.exportmodel;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.m2m.atl.profiler.exportmodel.provider.ExportmodelEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/about.html b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/about.html +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/pom.xml b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/pom.xml index 7e061596..52c05c84 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/pom.xml +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.profiler.exportmodel</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/AtlOperationExport.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/AtlOperationExport.java index 3cea7519..f870c3a6 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/AtlOperationExport.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/AtlOperationExport.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportElement.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportElement.java index 2d6cf71b..5bd8eba8 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportElement.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportElement.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportRoot.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportRoot.java index 35e80756..60334eb2 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportRoot.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportRoot.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportmodelFactory.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportmodelFactory.java index 2c1b78fb..a4a36164 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportmodelFactory.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportmodelFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportmodelPackage.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportmodelPackage.java index 4a0b225c..96442eb3 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportmodelPackage.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ExportmodelPackage.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ProfilingOperationExport.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ProfilingOperationExport.java index 9d38662a..d450ecf0 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ProfilingOperationExport.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/ProfilingOperationExport.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/AtlOperationExportImpl.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/AtlOperationExportImpl.java index b997eb36..cbc72874 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/AtlOperationExportImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/AtlOperationExportImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportElementImpl.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportElementImpl.java index e8825b1b..1edc18d9 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportElementImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportElementImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportRootImpl.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportRootImpl.java index 14ba4956..4f8bd445 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportRootImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportRootImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportmodelFactoryImpl.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportmodelFactoryImpl.java index 8f450589..56de964f 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportmodelFactoryImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportmodelFactoryImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportmodelPackageImpl.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportmodelPackageImpl.java index e965422a..340c9d0c 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportmodelPackageImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ExportmodelPackageImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ProfilingOperationExportImpl.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ProfilingOperationExportImpl.java index 9c81c703..603d7e11 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ProfilingOperationExportImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/impl/ProfilingOperationExportImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/AtlOperationExportItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/AtlOperationExportItemProvider.java index 645ed3bb..ac57fafa 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/AtlOperationExportItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/AtlOperationExportItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportElementItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportElementItemProvider.java index 5bd53090..def33baf 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportElementItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportElementItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportRootItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportRootItemProvider.java index c320d0e4..3b9f0dea 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportRootItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportRootItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportmodelEditPlugin.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportmodelEditPlugin.java index 25736226..2ee3ac60 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportmodelEditPlugin.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportmodelEditPlugin.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportmodelItemProviderAdapterFactory.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportmodelItemProviderAdapterFactory.java index 5b8c25b3..aefe320b 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportmodelItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ExportmodelItemProviderAdapterFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ProfilingOperationExportItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ProfilingOperationExportItemProvider.java index 8d36e2fd..795d276e 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ProfilingOperationExportItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/provider/ProfilingOperationExportItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/util/ExportmodelAdapterFactory.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/util/ExportmodelAdapterFactory.java index 43586a35..170b44ec 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/util/ExportmodelAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/util/ExportmodelAdapterFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/util/ExportmodelSwitch.java b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/util/ExportmodelSwitch.java index dba177ff..bf7188e9 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/util/ExportmodelSwitch.java +++ b/plugins/org.eclipse.m2m.atl.profiler.exportmodel/src/org/eclipse/m2m/atl/profiler/exportmodel/util/ExportmodelSwitch.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.profiler.model/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.profiler.model/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.profiler.model/META-INF/MANIFEST.MF index d5895611..0a041026 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.profiler.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.profiler.model;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.m2m.atl.profiler.model.provider.ATLProfilerEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/about.html b/plugins/org.eclipse.m2m.atl.profiler.model/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/about.html +++ b/plugins/org.eclipse.m2m.atl.profiler.model/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/pom.xml b/plugins/org.eclipse.m2m.atl.profiler.model/pom.xml index 001bc29b..7b8939d1 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/pom.xml +++ b/plugins/org.eclipse.m2m.atl.profiler.model/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.profiler.model</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ATLInstruction.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ATLInstruction.java index fefdcdc3..e354884c 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ATLInstruction.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ATLInstruction.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ATLOperation.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ATLOperation.java index 6222b657..e58081e3 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ATLOperation.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ATLOperation.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/Context.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/Context.java index d3e81ba8..8f814ced 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/Context.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/Context.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ExecutionError.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ExecutionError.java index efe8881b..4d38e6ae 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ExecutionError.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ExecutionError.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ModelFactory.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ModelFactory.java index 2f997f89..1d7d0ae5 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ModelFactory.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ModelFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ModelPackage.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ModelPackage.java index 95041e8c..c7f1927f 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ModelPackage.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ModelPackage.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingInstruction.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingInstruction.java index 3b13469d..f15b52f0 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingInstruction.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingInstruction.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingModel.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingModel.java index 8d86e6ff..ff8f81f4 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingModel.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingModel.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingOperation.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingOperation.java index 6775493c..63bcb3e0 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingOperation.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/ProfilingOperation.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ATLInstructionImpl.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ATLInstructionImpl.java index c2f396db..8e580ef0 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ATLInstructionImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ATLInstructionImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ATLOperationImpl.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ATLOperationImpl.java index 966d91fc..6c1d7b1a 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ATLOperationImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ATLOperationImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ContextImpl.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ContextImpl.java index cce90100..5130458c 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ContextImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ContextImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ExecutionErrorImpl.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ExecutionErrorImpl.java index d63099df..8bf4bbfc 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ExecutionErrorImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ExecutionErrorImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ModelFactoryImpl.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ModelFactoryImpl.java index 0ab6220d..c22f5816 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ModelFactoryImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ModelFactoryImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ModelPackageImpl.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ModelPackageImpl.java index 5efefcac..d2f75efa 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ModelPackageImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ModelPackageImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingInstructionImpl.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingInstructionImpl.java index 114c0a91..a6648c05 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingInstructionImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingInstructionImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingModelImpl.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingModelImpl.java index 7e536d5d..e9c2ed7b 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingModelImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingModelImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingOperationImpl.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingOperationImpl.java index c0c40131..905f7941 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingOperationImpl.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/impl/ProfilingOperationImpl.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLInstructionItemProvider.java index e9bda2da..ceb640ba 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLInstructionItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLInstructionItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLOperationItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLOperationItemProvider.java index 0ad0b2ed..7412c828 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLOperationItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLOperationItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLProfilerEditPlugin.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLProfilerEditPlugin.java index 0354c69c..5846ccdb 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLProfilerEditPlugin.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ATLProfilerEditPlugin.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ContextItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ContextItemProvider.java index d7817cd8..d2b6cee7 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ContextItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ContextItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ExecutionErrorItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ExecutionErrorItemProvider.java index dbb7e940..921f6878 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ExecutionErrorItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ExecutionErrorItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ModelItemProviderAdapterFactory.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ModelItemProviderAdapterFactory.java index ea15524b..c439fa6d 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ModelItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ModelItemProviderAdapterFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingInstructionItemProvider.java index 9c29dd0f..6d8cb22f 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingInstructionItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingInstructionItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingModelItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingModelItemProvider.java index 2b503648..754eec17 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingModelItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingModelItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingOperationItemProvider.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingOperationItemProvider.java index a46d3107..39c6749f 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingOperationItemProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/provider/ProfilingOperationItemProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/util/ModelAdapterFactory.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/util/ModelAdapterFactory.java index dd446934..6072f629 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/util/ModelAdapterFactory.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/util/ModelAdapterFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/util/ModelSwitch.java b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/util/ModelSwitch.java index 51f9a5bf..fec017b1 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/util/ModelSwitch.java +++ b/plugins/org.eclipse.m2m.atl.profiler.model/src/org/eclipse/m2m/atl/profiler/model/util/ModelSwitch.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.profiler.ui/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.profiler.ui/META-INF/MANIFEST.MF index 9fbdd948..a52df5f6 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.profiler.ui;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Activator: org.eclipse.m2m.atl.profiler.ui.activators.ExecutionViewerActivator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/about.html b/plugins/org.eclipse.m2m.atl.profiler.ui/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/about.html +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/pom.xml b/plugins/org.eclipse.m2m.atl.profiler.ui/pom.xml index 0ac1ad38..94083f76 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/pom.xml +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.profiler.ui</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/Messages.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/Messages.java index a6b4906b..450bf52e 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/Messages.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/Messages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/activators/ExecutionViewerActivator.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/activators/ExecutionViewerActivator.java index d9c76c78..e4e0c35e 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/activators/ExecutionViewerActivator.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/activators/ExecutionViewerActivator.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/activators/ProfilingDataTableActivator.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/activators/ProfilingDataTableActivator.java index 18ca3526..4a60b046 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/activators/ProfilingDataTableActivator.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/activators/ProfilingDataTableActivator.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/CallsViewContentProvider.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/CallsViewContentProvider.java index 49c04855..02fc8ef7 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/CallsViewContentProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/CallsViewContentProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/CallsViewLabelProvider.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/CallsViewLabelProvider.java index 1c3151f8..7118f42d 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/CallsViewLabelProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/CallsViewLabelProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionView.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionView.java index 49bac27a..50933451 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionView.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionView.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionViewContentProvider.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionViewContentProvider.java index f35fe2fd..c6ae7784 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionViewContentProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionViewContentProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionViewLabelProvider.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionViewLabelProvider.java index 8b5102a0..bfb3bc59 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionViewLabelProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/ExecutionViewLabelProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/InstructionFilter.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/InstructionFilter.java index b0c8bb0a..ee17f41d 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/InstructionFilter.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/executionviewer/view/InstructionFilter.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/messages.properties b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/messages.properties index 08339a96..2946b7cb 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/messages.properties +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/messages.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/CallsComparator.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/CallsComparator.java index b1ae4b50..83b1e354 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/CallsComparator.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/CallsComparator.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ExportDialog.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ExportDialog.java index 25e9f77e..e8f5b7f2 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ExportDialog.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ExportDialog.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/MemoryComparator.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/MemoryComparator.java index d03a8961..b4b9d9c3 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/MemoryComparator.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/MemoryComparator.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/NameComparator.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/NameComparator.java index 3913239b..9c8b895b 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/NameComparator.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/NameComparator.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/NativeOperationFilter.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/NativeOperationFilter.java index 35f7d93d..e6050e82 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/NativeOperationFilter.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/NativeOperationFilter.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableContentProvider.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableContentProvider.java index 8cd06a61..68688189 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableContentProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableContentProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableLabelProvider.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableLabelProvider.java index c6089435..bde0f5c9 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableLabelProvider.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableLabelProvider.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableView.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableView.java index 192561e1..e0a24e0a 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableView.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/ProfilingDataTableView.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/TimeComparator.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/TimeComparator.java index b5a4d7dd..7c1977c8 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/TimeComparator.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/TimeComparator.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/TotalInstructionComparator.java b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/TotalInstructionComparator.java index cd63ae1e..27e791fc 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/TotalInstructionComparator.java +++ b/plugins/org.eclipse.m2m.atl.profiler.ui/src/org/eclipse/m2m/atl/profiler/ui/profilingdatatable/TotalInstructionComparator.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.vm/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.m2m.atl.profiler.vm/.settings/org.eclipse.jdt.ui.prefs index e03f5e9f..ac47d907 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.vm/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.m2m.atl.profiler.vm/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 formatter_profile=_ATL formatter_settings_version=11 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml * Copyright (c) 2012 Obeo.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\r\n * \r\n * Contributors\:\r\n * Obeo - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n *\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.m2m.atl.profiler.vm/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.profiler.vm/META-INF/MANIFEST.MF index 32ae90fe..7d47a551 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.vm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl.profiler.vm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.profiler.vm;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.m2m.atl.profiler.core, diff --git a/plugins/org.eclipse.m2m.atl.profiler.vm/about.html b/plugins/org.eclipse.m2m.atl.profiler.vm/about.html index 2f0dcd74..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.vm/about.html +++ b/plugins/org.eclipse.m2m.atl.profiler.vm/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 24, 2008</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.profiler.vm/pom.xml b/plugins/org.eclipse.m2m.atl.profiler.vm/pom.xml index 48835adb..fb6a8417 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.vm/pom.xml +++ b/plugins/org.eclipse.m2m.atl.profiler.vm/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.profiler.vm</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/ProfilerLauncher.java b/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/ProfilerLauncher.java index fe2e8be3..69e7c617 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/ProfilerLauncher.java +++ b/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/ProfilerLauncher.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/ProfilingDebugger.java b/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/ProfilingDebugger.java index 0d329d7c..31372c9c 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/ProfilingDebugger.java +++ b/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/ProfilingDebugger.java @@ -2,9 +2,9 @@ * Copyright (c) 2008,2009 Communication & Systems. * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Arnaud Giuliani - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/adapter/OperationAdapter.java b/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/adapter/OperationAdapter.java index 411af036..b5342e7a 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/adapter/OperationAdapter.java +++ b/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/adapter/OperationAdapter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/adapter/StackFrameAdapter.java b/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/adapter/StackFrameAdapter.java index 1fb38003..fc5c737c 100644 --- a/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/adapter/StackFrameAdapter.java +++ b/plugins/org.eclipse.m2m.atl.profiler.vm/src/org/eclipse/m2m/atl/profiler/vm/adapter/StackFrameAdapter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.sdk-feature/build.properties b/plugins/org.eclipse.m2m.atl.sdk-feature/build.properties index 8dec1bf4..42917789 100644 --- a/plugins/org.eclipse.m2m.atl.sdk-feature/build.properties +++ b/plugins/org.eclipse.m2m.atl.sdk-feature/build.properties @@ -1,4 +1,4 @@ -bin.includes = epl-v10.html,\ +bin.includes = epl-v20.html,\ modeling32.png,\ feature.properties,\ feature.xml,\ @@ -6,5 +6,5 @@ bin.includes = epl-v10.html,\ src.includes = feature.xml,\ feature.properties,\ license.html,\ - epl-v10.html,\ + epl-v20.html,\ modeling32.png diff --git a/plugins/org.eclipse.m2m.atl.sdk-feature/copyright.txt b/plugins/org.eclipse.m2m.atl.sdk-feature/copyright.txt index 8de5c4bd..df7be49a 100644 --- a/plugins/org.eclipse.m2m.atl.sdk-feature/copyright.txt +++ b/plugins/org.eclipse.m2m.atl.sdk-feature/copyright.txt @@ -1,8 +1,8 @@ Copyright (c) 2007, 2012 Obeo. All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial API and implementation
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.sdk-feature/epl-v10.html b/plugins/org.eclipse.m2m.atl.sdk-feature/epl-v10.html deleted file mode 100644 index f957f3e7..00000000 --- a/plugins/org.eclipse.m2m.atl.sdk-feature/epl-v10.html +++ /dev/null @@ -1,259 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- saved from url=(0041)http://www.eclipse.org/legal/epl-v10.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -<style type="text/css"></style></head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to 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.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - - - -</body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.sdk-feature/epl-v20.html b/plugins/org.eclipse.m2m.atl.sdk-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/plugins/org.eclipse.m2m.atl.sdk-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.m2m.atl.sdk-feature/feature.properties b/plugins/org.eclipse.m2m.atl.sdk-feature/feature.properties index 721b07f4..198157e8 100644 --- a/plugins/org.eclipse.m2m.atl.sdk-feature/feature.properties +++ b/plugins/org.eclipse.m2m.atl.sdk-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002-2005 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 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * Obeo - SDK feature @@ -23,9 +23,9 @@ ModelingUpdateSiteName=Eclipse Modeling copyrightURL=copyright.txt copyright=Copyright (c) 2007, 2012 Obeo.\n\ All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ +https://www.eclipse.org/legal/epl-2.0/\n\ \n\ Contributors:\n\ Obeo - initial API and implementation @@ -38,125 +38,143 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 9, 2014\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## diff --git a/plugins/org.eclipse.m2m.atl.sdk-feature/feature.xml b/plugins/org.eclipse.m2m.atl.sdk-feature/feature.xml index 2295e148..0a078784 100644 --- a/plugins/org.eclipse.m2m.atl.sdk-feature/feature.xml +++ b/plugins/org.eclipse.m2m.atl.sdk-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.m2m.atl.sdk" label="%featureName" - version="4.1.0.qualifier" + version="4.10.0.qualifier" provider-name="%providerName"> <description> @@ -23,11 +23,11 @@ </url> <includes - id="org.eclipse.m2m.atl.doc" + id="org.eclipse.m2m.atl" version="0.0.0"/> <includes - id="org.eclipse.m2m.atl" + id="org.eclipse.m2m.atl.doc" version="0.0.0"/> <includes @@ -42,6 +42,10 @@ id="org.eclipse.m2m.atl.emftvm" version="0.0.0"/> + <includes + id="org.eclipse.m2m.atl.emftvm.cdo" + version="0.0.0"/> + <plugin id="org.eclipse.m2m.atl.examples.source" download-size="0" @@ -224,4 +228,67 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.m2m.atl.emftvm.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.ant.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.compiler.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.edit.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.editor.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.launcher.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.trace.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.trace.edit.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.m2m.atl.emftvm.trace.editor.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> diff --git a/plugins/org.eclipse.m2m.atl.sdk-feature/license.html b/plugins/org.eclipse.m2m.atl.sdk-feature/license.html index cecf137d..afb2f35c 100644 --- a/plugins/org.eclipse.m2m.atl.sdk-feature/license.html +++ b/plugins/org.eclipse.m2m.atl.sdk-feature/license.html @@ -1,106 +1,190 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<?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> -<style type="text/css"></style></head> +</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>
\ No newline at end of file + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/plugins/org.eclipse.m2m.atl.sdk-feature/pom.xml b/plugins/org.eclipse.m2m.atl.sdk-feature/pom.xml index 8f1770b4..5fadcff8 100644 --- a/plugins/org.eclipse.m2m.atl.sdk-feature/pom.xml +++ b/plugins/org.eclipse.m2m.atl.sdk-feature/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl.features</groupId> <artifactId>org.eclipse.m2m.atl.sdk</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/plugins/org.eclipse.m2m.atl.service.core/about.html b/plugins/org.eclipse.m2m.atl.service.core/about.html index 2b9bcfbe..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/about.html +++ b/plugins/org.eclipse.m2m.atl.service.core/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>May 30, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/Activator.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/Activator.java index 00340638..0e899ce1 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/Activator.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/Activator.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/JarClassLoader.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/JarClassLoader.java index 17ba7e36..d6316708 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/JarClassLoader.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/JarClassLoader.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceExtensionManager.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceExtensionManager.java index eeaedb45..6de791fd 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceExtensionManager.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceExtensionManager.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceMessages.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceMessages.java index 06016869..1b453054 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceMessages.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceMessages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006, 2010 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Messages externalization diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceTransformationUtil.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceTransformationUtil.java index 68857195..da94e551 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceTransformationUtil.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/ServiceTransformationUtil.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/ComposedTransformationConfiguration.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/ComposedTransformationConfiguration.java index 03761d5b..dfda9f6c 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/ComposedTransformationConfiguration.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/ComposedTransformationConfiguration.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/SingleTransformationConfiguration.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/SingleTransformationConfiguration.java index 20dd2edc..23c6379a 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/SingleTransformationConfiguration.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/SingleTransformationConfiguration.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/TransformationConfiguration.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/TransformationConfiguration.java index 7644f6d8..712eea9f 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/TransformationConfiguration.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/configuration/TransformationConfiguration.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/exception/ServiceException.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/exception/ServiceException.java index 2347e4cc..4a882598 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/exception/ServiceException.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/exception/ServiceException.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/Model.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/Model.java index 25aa2192..1c71554d 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/Model.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/Model.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/ModelToSave.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/ModelToSave.java index 96c6e30a..77a61e92 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/ModelToSave.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/ModelToSave.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/Transformation.java b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/Transformation.java index 9af4dc6c..9896a8b0 100644 --- a/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/Transformation.java +++ b/plugins/org.eclipse.m2m.atl.service.core/src/org/eclipse/m2m/atl/service/core/nestedElements/Transformation.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007 INRIA. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Freddy Allilaire (INRIA) - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl/META-INF/MANIFEST.MF index 93311fbf..de2c01d1 100644 --- a/plugins/org.eclipse.m2m.atl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.m2m.atl/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl; singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ClassPath: . diff --git a/plugins/org.eclipse.m2m.atl/about.html b/plugins/org.eclipse.m2m.atl/about.html index c9143d21..044c0c86 100644 --- a/plugins/org.eclipse.m2m.atl/about.html +++ b/plugins/org.eclipse.m2m.atl/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>December 7, 2007</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/plugins/org.eclipse.m2m.atl/about.mappings b/plugins/org.eclipse.m2m.atl/about.mappings index 7d795dc2..bec3dc25 100644 --- a/plugins/org.eclipse.m2m.atl/about.mappings +++ b/plugins/org.eclipse.m2m.atl/about.mappings @@ -1,5 +1,3 @@ # This file contains fill-ins for about.properties # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. - -0=@build@ diff --git a/plugins/org.eclipse.m2m.atl/about.properties b/plugins/org.eclipse.m2m.atl/about.properties index f5186e07..e9eb2ef6 100644 --- a/plugins/org.eclipse.m2m.atl/about.properties +++ b/plugins/org.eclipse.m2m.atl/about.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002-2005 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 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * IBM - Initial API and implementation @@ -32,7 +32,6 @@ featureText=ATL Transformation Language (ATL)\n\ Version: {featureVersion}\n\ -Build id: {0}\n\ \n\ (c) Copyright ATLAS Group (INRIA & LINA). 2004, 2009. All rights reserved.\n\ \n\ diff --git a/plugins/org.eclipse.m2m.atl/codeStyle/ATLCodeTemplates.xml b/plugins/org.eclipse.m2m.atl/codeStyle/ATLCodeTemplates.xml index a50c2c03..2292ec35 100644 --- a/plugins/org.eclipse.m2m.atl/codeStyle/ATLCodeTemplates.xml +++ b/plugins/org.eclipse.m2m.atl/codeStyle/ATLCodeTemplates.xml @@ -20,9 +20,9 @@ */</template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - initial API and implementation diff --git a/plugins/org.eclipse.m2m.atl/pom.xml b/plugins/org.eclipse.m2m.atl/pom.xml index 623a77e8..97fb011c 100644 --- a/plugins/org.eclipse.m2m.atl/pom.xml +++ b/plugins/org.eclipse.m2m.atl/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,25 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <generateDownloadStatsProperty>true</generateDownloadStatsProperty> + </configuration> + </plugin> + </plugins> + </build> + </project> diff --git a/releng/org.eclipse.m2m.atl.build-feature/build.properties b/releng/org.eclipse.m2m.atl.build-feature/build.properties index 01b0213b..4196e214 100644 --- a/releng/org.eclipse.m2m.atl.build-feature/build.properties +++ b/releng/org.eclipse.m2m.atl.build-feature/build.properties @@ -1,5 +1,5 @@ bin.includes = feature.xml,\ feature.properties,\ - epl-v10.html,\ + epl-v20.html,\ eclipse_update_120.jpg,\ license.html diff --git a/releng/org.eclipse.m2m.atl.build-feature/epl-v10.html b/releng/org.eclipse.m2m.atl.build-feature/epl-v10.html deleted file mode 100644 index cb1073a4..00000000 --- a/releng/org.eclipse.m2m.atl.build-feature/epl-v10.html +++ /dev/null @@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<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=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - 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; - } -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; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@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></p> - -</div> - -</body> - -</html>
\ No newline at end of file diff --git a/releng/org.eclipse.m2m.atl.build-feature/epl-v20.html b/releng/org.eclipse.m2m.atl.build-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/releng/org.eclipse.m2m.atl.build-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/releng/org.eclipse.m2m.atl.build-feature/feature.properties b/releng/org.eclipse.m2m.atl.build-feature/feature.properties index fb251783..45208151 100644 --- a/releng/org.eclipse.m2m.atl.build-feature/feature.properties +++ b/releng/org.eclipse.m2m.atl.build-feature/feature.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2008, 2011 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - initial API and implementation @@ -22,9 +22,9 @@ ModelingUpdateSiteName=Eclipse Modeling copyright=Copyright (c) 2007, 2011 Obeo, France. \n\ All rights reserved. This program and the accompanying materials \n\ -are made available under the terms of the Eclipse Public License v1.0 \n\ +are made available under the terms of the Eclipse Public License v2.0 \n\ which accompanies this distribution, and is available at \n\ -http://www.eclipse.org/legal/epl-v10.html \n\ +https://www.eclipse.org/legal/epl-2.0/ \n\ \n\ Contributors: \n\ Obeo - initial API and implementation @@ -57,8 +57,8 @@ 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\ +the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at https://www.eclipse.org/legal/epl-2.0/.\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\ diff --git a/releng/org.eclipse.m2m.atl.build-feature/license.html b/releng/org.eclipse.m2m.atl.build-feature/license.html index f19c483b..c35d8345 100644 --- a/releng/org.eclipse.m2m.atl.build-feature/license.html +++ b/releng/org.eclipse.m2m.atl.build-feature/license.html @@ -21,8 +21,8 @@ <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>. +<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 2.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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 diff --git a/releng/org.eclipse.m2m.atl.releng.parent/.settings/org.eclipse.m2e.core.prefs b/releng/org.eclipse.m2m.atl.releng.parent/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..f897a7f1 --- /dev/null +++ b/releng/org.eclipse.m2m.atl.releng.parent/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/releng/org.eclipse.m2m.atl.releng.parent/README.textile b/releng/org.eclipse.m2m.atl.releng.parent/README.textile index e34a6432..cc3071c1 100644 --- a/releng/org.eclipse.m2m.atl.releng.parent/README.textile +++ b/releng/org.eclipse.m2m.atl.releng.parent/README.textile @@ -1,5 +1,4 @@ Use this project to build ATL. -- for local build, use this command : 'mvn -s settings.xml -P localBuild clean verify' (will use the local profile definition) -- on hudson, just use 'clean verify' +- use this command : 'mvn clean verify' - to mute maven messages, use -q option diff --git a/releng/org.eclipse.m2m.atl.releng.parent/pom.xml b/releng/org.eclipse.m2m.atl.releng.parent/pom.xml index ec79a820..e3ce45c8 100644 --- a/releng/org.eclipse.m2m.atl.releng.parent/pom.xml +++ b/releng/org.eclipse.m2m.atl.releng.parent/pom.xml @@ -3,9 +3,9 @@ Copyright (C) 2011,2012 Obeo All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ --> <project xmlns="http://maven.apache.org/POM/4.0.0" @@ -19,17 +19,17 @@ <groupId>org.eclipse.m2m.atl</groupId> <artifactId>m2m.atl-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>pom</packaging> <licenses> <license> - <name>Eclipse Public License v1.0</name> + <name>Eclipse Public License v2.0</name> <comments> All rights reserved. This program and the accompanying materials are made - available under the terms of the Eclipse Public License v1.0 + available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.htm </comments> @@ -37,13 +37,20 @@ </licenses> <properties> - <tycho-version>0.22.0</tycho-version> - <tycho-extras-version>0.22.0</tycho-extras-version> + <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format> + <buildTimestamp>${maven.build.timestamp}</buildTimestamp> + <buildId>${buildType}${buildTimestamp}</buildId> + <buildType>${env.BUILD_TYPE}</buildType> + + <tycho-version>1.7.0</tycho-version> + <tycho-extras-version>1.7.0</tycho-extras-version> + <tycho.scmUrl>scm:git:https://git.eclipse.org/c/mmt/org.eclipse.atl.git</tycho.scmUrl> + <!-- Properties to enable jacoco code coverage analysis --> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.jacoco.reportPath>../../target/jacoco.exec</sonar.jacoco.reportPath> - <project.releaseVersion>4.0.1</project.releaseVersion> + <project.releaseVersion>4.10.0</project.releaseVersion> </properties> <distributionManagement> @@ -67,6 +74,7 @@ <module>../../plugins/org.eclipse.m2m.atl</module> <module>../../plugins/org.eclipse.m2m.atl-feature</module> <module>../../plugins/org.eclipse.m2m.atl.adt</module> + <module>../../plugins/org.eclipse.m2m.atl.adt-feature</module> <module>../../plugins/org.eclipse.m2m.atl.adt.debug</module> <module>../../plugins/org.eclipse.m2m.atl.adt.editor</module> <module>../../plugins/org.eclipse.m2m.atl.adt.ui</module> @@ -83,16 +91,21 @@ <module>../../plugins/org.eclipse.m2m.atl.emftvm</module> <module>../../plugins/org.eclipse.m2m.atl.emftvm-feature</module> <module>../../plugins/org.eclipse.m2m.atl.emftvm.ant</module> + <module>../../plugins/org.eclipse.m2m.atl.emftvm.cdo</module> + <module>../../plugins/org.eclipse.m2m.atl.emftvm.cdo-feature</module> <module>../../plugins/org.eclipse.m2m.atl.emftvm.compiler</module> <module>../../plugins/org.eclipse.m2m.atl.emftvm.edit</module> <module>../../plugins/org.eclipse.m2m.atl.emftvm.editor</module> + <module>../../plugins/org.eclipse.m2m.atl.emftvm.engine-feature</module> <module>../../plugins/org.eclipse.m2m.atl.emftvm.launcher</module> <module>../../plugins/org.eclipse.m2m.atl.emftvm.trace</module> <module>../../plugins/org.eclipse.m2m.atl.emftvm.trace.edit</module> <module>../../plugins/org.eclipse.m2m.atl.emftvm.trace.editor</module> <module>../../plugins/org.eclipse.m2m.atl.engine</module> + <module>../../plugins/org.eclipse.m2m.atl.engine-feature</module> <module>../../plugins/org.eclipse.m2m.atl.engine.emfvm</module> <module>../../plugins/org.eclipse.m2m.atl.engine.emfvm.launch</module> + <module>../../plugins/org.eclipse.m2m.atl.emftvm.ui-feature</module> <module>../../plugins/org.eclipse.m2m.atl.engine.vm</module> <module>../../plugins/org.eclipse.m2m.atl.profiler-feature</module> <module>../../plugins/org.eclipse.m2m.atl.profiler.core</module> @@ -149,6 +162,11 @@ <environment> <os>linux</os> <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> <arch>x86</arch> </environment> <environment> @@ -162,11 +180,6 @@ <arch>x86_64</arch> </environment> <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86_64</arch> - </environment> - <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86_64</arch> @@ -174,26 +187,6 @@ </environments> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.6.201602180812</version> - <executions> - <execution> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- Where to put jacoco coverage report --> - <destFile>${sonar.jacoco.reportPath}</destFile> - <includes> - <include>org.eclipse.m2m.atl.*</include> - </includes> - <append>true</append> - </configuration> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> <plugins> @@ -228,6 +221,16 @@ </executions> </plugin> <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-document-bundle-plugin</artifactId> + <version>${tycho-extras-version}</version> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <version>2.4.1</version> @@ -295,7 +298,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.5</version> + <version>3.0.0-M1</version> <configuration> <skip>true</skip> </configuration> @@ -312,59 +315,20 @@ <profiles> <profile> - <id>2018-12</id> - <repositories> - <repository> - <id>releasetrain</id> - <layout>p2</layout> - <url>http://download.eclipse.org/releases/2018-12</url> - </repository> - <repository> - <id>orbit</id> - <layout>p2</layout> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/S20181031145145/repository</url> - </repository> - <repository> - <id>emf compare 1.2 (test purpose only)</id> - <layout>p2</layout> - <url>http://download.eclipse.org/modeling/emf/compare/updates/releases/1.2</url> - </repository> - </repositories> - </profile> - - <profile> - <id>2018-09</id> - <repositories> - <repository> - <id>releasetrain</id> - <layout>p2</layout> - <url>http://download.eclipse.org/releases/2018-09</url> - </repository> - <repository> - <id>orbit</id> - <layout>p2</layout> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/S20181031145145/repository</url> - </repository> - <repository> - <id>emf compare 1.2 (test purpose only)</id> - <layout>p2</layout> - <url>http://download.eclipse.org/modeling/emf/compare/updates/releases/1.2</url> - </repository> - </repositories> - </profile> - - <profile> - <id>photon</id> + <id>latest</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <repositories> <repository> <id>releasetrain</id> <layout>p2</layout> - <url>http://download.eclipse.org/releases/photon</url> + <url>https://download.eclipse.org/releases/latest</url> </repository> <repository> <id>orbit</id> <layout>p2</layout> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository</url> + <url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest</url> </repository> <repository> <id>emf compare 1.2 (test purpose only)</id> @@ -375,17 +339,17 @@ </profile> <profile> - <id>oxygen</id> + <id>2021-03</id> <repositories> <repository> <id>releasetrain</id> <layout>p2</layout> - <url>http://download.eclipse.org/releases/oxygen</url> + <url>https://download.eclipse.org/releases/2021-03</url> </repository> <repository> <id>orbit</id> <layout>p2</layout> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository</url> + <url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest</url> </repository> <repository> <id>emf compare 1.2 (test purpose only)</id> @@ -396,17 +360,17 @@ </profile> <profile> - <id>neon</id> + <id>2019-12</id> <repositories> <repository> <id>releasetrain</id> <layout>p2</layout> - <url>http://download.eclipse.org/releases/neon</url> + <url>https://download.eclipse.org/releases/2019-12</url> </repository> <repository> <id>orbit</id> <layout>p2</layout> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository</url> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository</url> </repository> <repository> <id>emf compare 1.2 (test purpose only)</id> @@ -491,7 +455,7 @@ <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.2</version> + <version>1.3.0</version> <executions> <execution> <id>sign</id> @@ -532,6 +496,7 @@ </pluginRepository> </pluginRepositories> </profile> + </profiles> </project> diff --git a/releng/org.eclipse.m2m.atl.update/addDownloadStats.xsl b/releng/org.eclipse.m2m.atl.update/addDownloadStats.xsl index bd14bd07..b4ae4aff 100644 --- a/releng/org.eclipse.m2m.atl.update/addDownloadStats.xsl +++ b/releng/org.eclipse.m2m.atl.update/addDownloadStats.xsl @@ -1,9 +1,9 @@ <!-- Copyright (c) 2010 Mia-Software All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ Contributors: Gregoire Dupe (Mia-Software) - initial contribution diff --git a/releng/org.eclipse.m2m.atl.update/category.xml b/releng/org.eclipse.m2m.atl.update/category.xml index f2102705..7d201bc0 100644 --- a/releng/org.eclipse.m2m.atl.update/category.xml +++ b/releng/org.eclipse.m2m.atl.update/category.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <site> + <feature id="org.eclipse.m2m.atl" version="0.0.0"> + <category name="atl"/> + </feature> <feature id="org.eclipse.m2m.atl.doc" version="0.0.0"> <category name="atl"/> </feature> @@ -9,18 +12,29 @@ <feature id="org.eclipse.m2m.atl.profiler" version="0.0.0"> <category name="atl"/> </feature> - <feature id="org.eclipse.m2m.atl.sdk" version="0.0.0"> + <feature id="org.eclipse.m2m.atl.emftvm" version="0.0.0"> <category name="atl"/> </feature> - <feature id="org.eclipse.m2m.atl" version="0.0.0"> + <feature id="org.eclipse.m2m.atl.emftvm.cdo" version="0.0.0"> <category name="atl"/> </feature> - <feature id="org.eclipse.m2m.atl.emftvm" version="0.0.0"> + <feature id="org.eclipse.m2m.atl.sdk" version="0.0.0"> <category name="atl"/> </feature> + <feature id="org.eclipse.m2m.atl.engine" version="0.0.0"> + <category name="atl-headless"/> + </feature> + <feature id="org.eclipse.m2m.atl.emftvm.engine" version="0.0.0"> + <category name="atl-headless"/> + </feature> <category-def name="atl" label="ATL"> <description> ATL features. </description> </category-def> + <category-def name="atl-headless" label="ATL headless"> + <description> + ATL runtime engine only features. + </description> + </category-def> </site> diff --git a/releng/org.eclipse.m2m.atl.update/downloads.sh b/releng/org.eclipse.m2m.atl.update/downloads.sh new file mode 100644 index 00000000..999e8e61 --- /dev/null +++ b/releng/org.eclipse.m2m.atl.update/downloads.sh @@ -0,0 +1,63 @@ +#!/bin/bash -xv +#******************************************************************************* +# Copyright (c) 2017, 2019 Willink Transformations and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v20.html +# +# Contributors: +# E.D.Willink - initial API and implementation +# Dennis Wagelaar +#******************************************************************************* +# +# Promote ~/publish.zip to the downloads 'page'. +# Promote ~/javadoc.zip to the downloads 'page'. +# +# -v PUBLISH__VERSION Unqualified version e.g. 3.9.0 +# -t PUBLISH__BUILD_T Build type N/I/S/R, blank suppresses promotion +# -q PUBLISH__QUALIFIER Version qualifier e.g. v20171025-1600 +# -a PUBLISH__ALIAS Non blank to use alias as part of final name +# +dropsFolder="/home/data/httpd/download.eclipse.org/mmt/atl/downloads/drops/" +group="modeling.mmt.atl" +zipPrefix="m2m-atl-Update-" + +while getopts v:t:q:a: option +do +case "${option}" +in +v) PUBLISH__VERSION=${OPTARG};; +t) PUBLISH__BUILD_T=${OPTARG};; +q) PUBLISH__QUALIFIER=${OPTARG};; +a) PUBLISH__ALIAS=${OPTARG};; +esac +done + +if [ -n "${PUBLISH__BUILD_T}" ] +then + + tQualifier="${PUBLISH__BUILD_T}${PUBLISH__QUALIFIER:1:8}${PUBLISH__QUALIFIER:10:4}" + versionFolder="${dropsFolder}${PUBLISH__VERSION}/${tQualifier}" + if [ ! -d "${versionFolder}" ] + then + mkdir -p ${versionFolder} + fi + + fileStem="${tQualifier}" + if [ -n "${PUBLISH__ALIAS}" ] + then + fileStem=${PUBLISH__ALIAS} + fi + zipFile="${zipPrefix}${fileStem}.zip" + + pushd ${versionFolder} + cp ~/publish.zip ${zipFile} + md5sum -b ${zipFile} > ${zipFile}.md5 + sha512sum -b ${zipFile} > ${zipFile}.sha1 + # make sure permissions are for the intended group + chgrp -R ${group} ${zipFile} ${zipFile}.md5 ${zipFile}.sha1 + chmod -R g+w ${zipFile} ${zipFile}.md5 ${zipFile}.sha1 + popd + +fi diff --git a/releng/org.eclipse.m2m.atl.update/pom.xml b/releng/org.eclipse.m2m.atl.update/pom.xml index c4170292..d01b32dd 100644 --- a/releng/org.eclipse.m2m.atl.update/pom.xml +++ b/releng/org.eclipse.m2m.atl.update/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2011, 2012 Obeo - + Cedric Brun <cedric.brun@obeo.fr> William Piers <william.piers@obeo.fr> @@ -15,7 +15,7 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> @@ -23,9 +23,28 @@ <packaging>eclipse-repository</packaging> <!-- see http://issues.sonatype.org/browse/TYCHO-313 --> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>publisher.properties</include> + </includes> + </resource> + <resource> + <directory>.</directory> + <filtering>false</filtering> + <includes> + <include>downloads.sh</include> + <include>index.html</include> + <include>publish.sh</include> + <include>updates.sh</include> + </includes> + </resource> + </resources> <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> @@ -33,61 +52,28 @@ <version>${tycho-version}</version> <configuration> <createArtifactRepository>true</createArtifactRepository> - <finalName>${project.artifactId}</finalName> + <finalName>${project.groupId}-${unqualifiedVersion}.${buildId}</finalName> <compress>true</compress> + <repositoryName>ATL ${unqualifiedVersion}.${buildId}</repositoryName> + <extraArtifactRepositoryProperties> + <p2.statsURI>https://download.eclipse.org/stats/</p2.statsURI> + </extraArtifactRepositoryProperties> </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> - <id>copy-resources</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/repository</outputDirectory> - <resources> - <resource> - <directory>.</directory> - <includes> - <include>index.html</include> - <include>web/*</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare_promotion</id> <phase>verify</phase> <goals> - <goal>run</goal> + <goal>resources</goal> </goals> - <configuration> - <tasks> - <!-- create a properties file for promotion process --> - <mkdir dir="${project.build.directory}/promotion" /> - <echo - file="${project.build.directory}/promotion/promote.properties" - message="#ATL promotion process.${line.separator}build.alias=${BUILD_ALIAS}${line.separator}build.qualifier=${env.BUILD_TYPE}${buildQualifier}${line.separator}version=${unqualifiedVersion}" /> - <!-- copy necessary scripts to archive location --> - <copy file="p2.xsl" - todir="${project.build.directory}/promotion" /> - <copy file="promoter.xml" - todir="${project.build.directory}/promotion" /> - <copy file="addDownloadStats.xsl" - todir="${project.build.directory}/promotion" /> - </tasks> - </configuration> </execution> </executions> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + </configuration> </plugin> </plugins> </build> diff --git a/releng/org.eclipse.m2m.atl.update/promoter.xml b/releng/org.eclipse.m2m.atl.update/promoter.xml index 789069df..d18033c4 100644 --- a/releng/org.eclipse.m2m.atl.update/promoter.xml +++ b/releng/org.eclipse.m2m.atl.update/promoter.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2011, 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial API and implementation diff --git a/releng/org.eclipse.m2m.atl.update/publish.sh b/releng/org.eclipse.m2m.atl.update/publish.sh new file mode 100644 index 00000000..b7f5e7fe --- /dev/null +++ b/releng/org.eclipse.m2m.atl.update/publish.sh @@ -0,0 +1,31 @@ +#!/bin/bash -xv +#******************************************************************************* +# Copyright (c) 2019 Willink Transformations and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v20.html +# +# Contributors: +# E.D.Willink - initial API and implementation +# Dennis Wagelaar +#******************************************************************************* +# Local ATL publish script for use by the promoter job. It prepares and invokes remote scripts. +# + +if [[ ${PUBLISH__PROMOTE} == "true" ]] +then + + rm -f downloads.sh publish.zip updates.sh + curl -s -k ${PUBLISH__DOWNLOADS_SH} > downloads.sh + curl -s -k ${PUBLISH__UPDATES_SH} > updates.sh + curl -s -k ${PUBLISH__URL} > publish.zip + ssh genie.atl@projects-storage.eclipse.org rm -f downloads.sh publish.zip updates.sh + scp downloads.sh genie.atl@projects-storage.eclipse.org:downloads.sh + scp publish.zip genie.atl@projects-storage.eclipse.org:publish.zip + scp updates.sh genie.atl@projects-storage.eclipse.org:updates.sh + ssh genie.atl@projects-storage.eclipse.org chmod +x downloads.sh updates.sh + ssh genie.atl@projects-storage.eclipse.org bash -ex downloads.sh -v "'${PUBLISH__VERSION}'" -t "'${PUBLISH__BUILD_T}'" -q "'${PUBLISH__QUALIFIER}'" -a "'${PUBLISH__ALIAS}'" + ssh genie.atl@projects-storage.eclipse.org bash -ex updates.sh -v "'${PUBLISH__VERSION}'" -t "'${PUBLISH__BUILD_T}'" -q "'${PUBLISH__QUALIFIER}'" + +fi diff --git a/releng/org.eclipse.m2m.atl.update/publisher.properties b/releng/org.eclipse.m2m.atl.update/publisher.properties new file mode 100644 index 00000000..23973dd3 --- /dev/null +++ b/releng/org.eclipse.m2m.atl.update/publisher.properties @@ -0,0 +1,16 @@ +# ATL publisher properties for use by the promoter job: +# +# rm -f publish.sh +# curl -s ${PUBLISH__PUBLISH_SH} > publish.sh +# chmod +x publish.sh +# bash -ex publish.sh +# +PUBLISH__ALIAS=${BUILD_ALIAS} +PUBLISH__BUILD_T=${buildType} +PUBLISH__DOWNLOADS_SH=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/org.eclipse.m2m.atl.update/target/downloads.sh +PUBLISH__PUBLISH_SH=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/org.eclipse.m2m.atl.update/target/publish.sh +PUBLISH__QUALIFIER=${buildId} +PUBLISH__UPDATES_SH=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/org.eclipse.m2m.atl.update/target/updates.sh +PUBLISH__URL=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/org.eclipse.m2m.atl.update/target/${project.groupId}-${unqualifiedVersion}.${buildId}.zip +PUBLISH__VERSION=${unqualifiedVersion} +PUBLISH__PROMOTE=${BUILD_PROMOTE} diff --git a/releng/org.eclipse.m2m.atl.update/updates.sh b/releng/org.eclipse.m2m.atl.update/updates.sh new file mode 100644 index 00000000..a2d01dc2 --- /dev/null +++ b/releng/org.eclipse.m2m.atl.update/updates.sh @@ -0,0 +1,146 @@ +#!/bin/bash -xv +#******************************************************************************* +# Copyright (c) 2017, 2019 Willink Transformations and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v20.html +# +# Contributors: +# E.D.Willink - initial API and implementation +# Dennis Wagelaar +#******************************************************************************* +# +# Promote ~/publish.zip to an updates repository. +# +# -v PUBLISH__VERSION Unqualified version e.g. 3.9.0 +# -t PUBLISH__BUILD_T Build type N/I/S/R, blank suppresses promotion +# -q PUBLISH__QUALIFIER Version qualifier e.g. v20171025-1600 +# +updatesFolder="/home/data/httpd/download.eclipse.org/mmt/atl/updates/" +group="modeling.mmt.atl" +localZip="atl.zip" +projectRepoName="ATL" +manageComposite="/shared/common/apache-ant-latest/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml" +externalUpdatesFolder="https://download.eclipse.org/mmt/atl/updates/" + +export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest +java -version +/shared/common/apache-ant-latest/bin/ant -version + +while getopts v:t:q: option +do +case "${option}" +in +v) PUBLISH__VERSION=${OPTARG};; +t) PUBLISH__BUILD_T=${OPTARG};; +q) PUBLISH__QUALIFIER=${OPTARG};; +esac +done + +if [ -n "${PUBLISH__BUILD_T}" ] +then + + tQualifier="${PUBLISH__BUILD_T}${PUBLISH__QUALIFIER:1:8}${PUBLISH__QUALIFIER:10:4}" + if [ "${PUBLISH__BUILD_T}" = "N" ] + then + buildFolder="${updatesFolder}nightly" + buildRepoName="Nightly" + latestRelativeReference="../${PUBLISH__VERSION}" + elif [ "${PUBLISH__BUILD_T}" = "I" ] + then + buildFolder="${updatesFolder}interim" + buildRepoName="Interim" + latestRelativeReference="../${PUBLISH__VERSION}" + elif [ "${PUBLISH__BUILD_T}" = "S" ] + then + buildFolder="${updatesFolder}milestones" + buildRepoName="Milestones" + latestRelativeReference="../${PUBLISH__VERSION}/${tQualifier}" + elif [ "${PUBLISH__BUILD_T}" = "R" ] + then + buildFolder="${updatesFolder}releases" + buildRepoName="Releases" + latestRelativeReference="../${PUBLISH__VERSION}" + else + buildFolder="${updatesFolder}other" + latestRelativeReference="../${PUBLISH__VERSION}" + buildRepoName="Other" + fi + + if [ ! -d "${buildFolder}" ] + then + mkdir -p ${buildFolder} + fi + + pushd ${buildFolder} + if [ ! -d "${PUBLISH__VERSION}" ] + then + mkdir ${PUBLISH__VERSION} + versionCompositeName="${projectRepoName} ${buildRepoName} Repository" + ${manageComposite} add -Dchild.repository=${PUBLISH__VERSION} -Dcomposite.name="${versionCompositeName}" + fi + + if [ "${PUBLISH__BUILD_T}" = "N" ] + then + cp ~/publish.zip ${localZip} + unzip -ou ${localZip} -d new${PUBLISH__VERSION} + chgrp -R ${group} new${PUBLISH__VERSION} + chmod -R g+w new${PUBLISH__VERSION} + mv ${PUBLISH__VERSION} old${PUBLISH__VERSION} + mv new${PUBLISH__VERSION} ${PUBLISH__VERSION} + rm -rf old${PUBLISH__VERSION} ${localZip} + elif [ "${PUBLISH__BUILD_T}" = "I" ] + then + cp ~/publish.zip ${localZip} + unzip -ou ${localZip} -d new${PUBLISH__VERSION} + chgrp -R ${group} new${PUBLISH__VERSION} + chmod -R g+w new${PUBLISH__VERSION} + mv ${PUBLISH__VERSION} old${PUBLISH__VERSION} + mv new${PUBLISH__VERSION} ${PUBLISH__VERSION} + rm -rf old${PUBLISH__VERSION} ${localZip} + elif [ "${PUBLISH__BUILD_T}" = "S" ] + then + pushd ${buildFolder}/${PUBLISH__VERSION} + + versionFolder="${buildFolder}/${tQualifier}" + if [ ! -d "${tQualifier}" ] + then + mkdir ${tQualifier} + fi + + cp ~/publish.zip ${localZip} + unzip ${localZip} -d ${tQualifier} + rm ${localZip} + + chgrp -R ${group} ${tQualifier} + chmod -R g+w ${tQualifier} + ${manageComposite} add -Dchild.repository=${tQualifier} -Dcomposite.name="${projectRepoName} ${PUBLISH__VERSION} ${buildRepoName} Repository" + popd + elif [ "${PUBLISH__BUILD_T}" = "R" ] + then + cp ~/publish.zip ${localZip} + unzip -ou ${localZip} -d new${PUBLISH__VERSION} + chgrp -R ${group} new${PUBLISH__VERSION} + chmod -R g+w new${PUBLISH__VERSION} + mv ${PUBLISH__VERSION} old${PUBLISH__VERSION} + mv new${PUBLISH__VERSION} ${PUBLISH__VERSION} + rm -rf old${PUBLISH__VERSION} ${localZip} + + fi + + rm -rf ${buildFolder}/newlatest + mkdir ${buildFolder}/newlatest + pushd ${buildFolder}/newlatest + ${manageComposite} add -Dchild.repository=${latestRelativeReference} -Dcomposite.name="${projectRepoName} Latest ${PUBLISH__VERSION} ${buildRepoName} Repository" + popd + if [ -d "latest" ] + then + mv latest oldlatest + fi + mv newlatest latest + rm -rf oldlatest + + popd + +fi diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.m2m.atl.emftvm.tests/META-INF/MANIFEST.MF index 1dbb5b3a..f03aadc9 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.tests;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -29,6 +29,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.m2m.atl.core.ui.vm, org.eclipse.m2m.atl.engine, org.eclipse.core.resources, - org.eclipse.m2m.atl.emftvm.ant + org.eclipse.m2m.atl.emftvm.ant, + org.eclipse.uml2.uml Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.m2m.atl.emftvm.tests diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM RefiningModeTest.launch b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM RefiningModeTest.launch index ea153727..47e3a57c 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM RefiningModeTest.launch +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM RefiningModeTest.launch @@ -1,35 +1,39 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.m2m.atl.emftvm.launcher.EMFTVMTransformation"> -<stringAttribute key="ATL File Name" value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl"/> -<booleanAttribute key="Disable JIT compiler" value="false"/> -<booleanAttribute key="Display Timing Data" value="true"/> -<booleanAttribute key="Enable JIT compiler" value="true"/> -<mapAttribute key="Inout Model Options"/> -<mapAttribute key="Inout Models"/> -<mapAttribute key="Inout Models Output Locations"/> -<mapAttribute key="Input Model Options"/> -<mapAttribute key="Input Models"> -<mapEntry key="IN" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/RefiningModeTest.atl"/> -</mapAttribute> -<mapAttribute key="Metamodel Options"> -<mapEntry key="ATL" value=""/> -</mapAttribute> -<mapAttribute key="Metamodels"> -<mapEntry key="ATL" value="http://www.eclipse.org/gmt/2005/ATL"/> -<mapEntry key="EMFTVM" value="http://www.eclipse.org/m2m/atl/2011/EMFTVM"/> -<mapEntry key="Problem" value="platform:/plugin/org.eclipse.m2m.atl.common/org/eclipse/m2m/atl/common/resources/Problem.ecore"/> -</mapAttribute> -<stringAttribute key="Module Name" value="ATLtoEMFTVM"/> -<stringAttribute key="Module Path" value="/org.eclipse.m2m.atl.emftvm.compiler/transformations/"/> -<mapAttribute key="Output Model Options"> -<mapEntry key="OUT" value="derivedFile"/> -<mapEntry key="PBS" value="derivedFile"/> -</mapAttribute> -<mapAttribute key="Output Models"> -<mapEntry key="OUT" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/RefiningModeTest.emftvm"/> -<mapEntry key="PBS" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/RefiningModeTest-problems.xmi"/> -</mapAttribute> -<listAttribute key="Superimpose"> -<listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.asm"/> -</listAttribute> + <stringAttribute key="ATL File Name" value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl"/> + <booleanAttribute key="Disable JIT compiler" value="false"/> + <booleanAttribute key="Display Profiling Data" value="false"/> + <booleanAttribute key="Display Timing Data" value="true"/> + <booleanAttribute key="Enable JIT compiler" value="true"/> + <mapAttribute key="Inout Model Options"/> + <mapAttribute key="Inout Models"/> + <mapAttribute key="Inout Models Output Locations"/> + <mapAttribute key="Input Model Options"/> + <mapAttribute key="Input Models"> + <mapEntry key="IN" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/RefiningModeTest.atl"/> + </mapAttribute> + <mapAttribute key="Metamodel Options"> + <mapEntry key="ATL" value=""/> + </mapAttribute> + <mapAttribute key="Metamodels"> + <mapEntry key="ATL" value="http://www.eclipse.org/gmt/2005/ATL"/> + <mapEntry key="EMFTVM" value="http://www.eclipse.org/m2m/atl/2011/EMFTVM"/> + <mapEntry key="Problem" value="platform:/plugin/org.eclipse.m2m.atl.common/org/eclipse/m2m/atl/common/resources/Problem.ecore"/> + </mapAttribute> + <stringAttribute key="Module Name" value="ATLtoEMFTVM"/> + <stringAttribute key="Module Path" value="/org.eclipse.m2m.atl.emftvm.compiler/transformations/"/> + <mapAttribute key="Output Model Options"> + <mapEntry key="OUT" value="derivedFile"/> + <mapEntry key="PBS" value="derivedFile"/> + </mapAttribute> + <mapAttribute key="Output Models"> + <mapEntry key="OUT" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/RefiningModeTest.emftvm"/> + <mapEntry key="PBS" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/RefiningModeTest-problems.xmi"/> + </mapAttribute> + <listAttribute key="Superimpose"> + <listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.asm"/> + <listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.asm"/> + <listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.asm"/> + </listAttribute> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> </launchConfiguration> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM SearchPlanTest.launch b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM SearchPlanTest.launch new file mode 100644 index 00000000..27512ade --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM SearchPlanTest.launch @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.m2m.atl.emftvm.launcher.EMFTVMTransformation"> + <stringAttribute key="ATL File Name" value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl"/> + <booleanAttribute key="Disable JIT compiler" value="false"/> + <booleanAttribute key="Display Profiling Data" value="false"/> + <booleanAttribute key="Display Timing Data" value="true"/> + <booleanAttribute key="Enable JIT compiler" value="true"/> + <mapAttribute key="Inout Model Options"/> + <mapAttribute key="Inout Models"/> + <mapAttribute key="Inout Models Output Locations"/> + <mapAttribute key="Input Model Options"/> + <mapAttribute key="Input Models"> + <mapEntry key="IN" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.atl"/> + </mapAttribute> + <mapAttribute key="Metamodel Options"> + <mapEntry key="ATL" value=""/> + </mapAttribute> + <mapAttribute key="Metamodels"> + <mapEntry key="ATL" value="http://www.eclipse.org/gmt/2005/ATL"/> + <mapEntry key="EMFTVM" value="http://www.eclipse.org/m2m/atl/2011/EMFTVM"/> + <mapEntry key="Problem" value="platform:/resource/org.eclipse.m2m.atl.common/model/Problem.ecore"/> + </mapAttribute> + <stringAttribute key="Module Name" value="ATLtoEMFTVM"/> + <stringAttribute key="Module Path" value="/org.eclipse.m2m.atl.emftvm.compiler/transformations/"/> + <mapAttribute key="Output Model Options"> + <mapEntry key="OUT" value="derivedFile"/> + <mapEntry key="PBS" value="derivedFile"/> + </mapAttribute> + <mapAttribute key="Output Models"> + <mapEntry key="OUT" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.emftvm"/> + <mapEntry key="PBS" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest-problems.xmi"/> + </mapAttribute> + <listAttribute key="Superimpose"> + <listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.asm"/> + <listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.asm"/> + <listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.asm"/> + </listAttribute> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> +</launchConfiguration> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM.launch b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM.launch index 7637cb29..665d52ef 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM.launch +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/ATLtoEMFTVM.launch @@ -1,36 +1,39 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.m2m.atl.emftvm.launcher.EMFTVMTransformation"> -<stringAttribute key="ATL File Name" value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl"/> -<booleanAttribute key="Disable JIT compiler" value="false"/> -<booleanAttribute key="Display Profiling Data" value="true"/> -<booleanAttribute key="Display Timing Data" value="true"/> -<booleanAttribute key="Enable JIT compiler" value="true"/> -<mapAttribute key="Inout Model Options"/> -<mapAttribute key="Inout Models"/> -<mapAttribute key="Inout Models Output Locations"/> -<mapAttribute key="Input Model Options"/> -<mapAttribute key="Input Models"> -<mapEntry key="IN" value="platform:/resource/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl"/> -</mapAttribute> -<mapAttribute key="Metamodel Options"> -<mapEntry key="ATL" value=""/> -</mapAttribute> -<mapAttribute key="Metamodels"> -<mapEntry key="ATL" value="http://www.eclipse.org/gmt/2005/ATL"/> -<mapEntry key="EMFTVM" value="http://www.eclipse.org/m2m/atl/2011/EMFTVM"/> -<mapEntry key="Problem" value="http://www.eclipse.org/gmt/2005/Problem"/> -</mapAttribute> -<stringAttribute key="Module Name" value="ATLtoEMFTVM"/> -<stringAttribute key="Module Path" value="/org.eclipse.m2m.atl.emftvm.compiler/transformations/"/> -<mapAttribute key="Output Model Options"> -<mapEntry key="OUT" value="derivedFile"/> -<mapEntry key="PBS" value="derivedFile"/> -</mapAttribute> -<mapAttribute key="Output Models"> -<mapEntry key="OUT" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/ATLtoEMFTVM.emftvm"/> -<mapEntry key="PBS" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/ATLtoEMFTVM-problems.xmi"/> -</mapAttribute> -<listAttribute key="Superimpose"> -<listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.asm"/> -</listAttribute> + <stringAttribute key="ATL File Name" value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl"/> + <booleanAttribute key="Disable JIT compiler" value="false"/> + <booleanAttribute key="Display Profiling Data" value="true"/> + <booleanAttribute key="Display Timing Data" value="true"/> + <booleanAttribute key="Enable JIT compiler" value="true"/> + <mapAttribute key="Inout Model Options"/> + <mapAttribute key="Inout Models"/> + <mapAttribute key="Inout Models Output Locations"/> + <mapAttribute key="Input Model Options"/> + <mapAttribute key="Input Models"> + <mapEntry key="IN" value="platform:/resource/org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLtoEMFTVM.atl"/> + </mapAttribute> + <mapAttribute key="Metamodel Options"> + <mapEntry key="ATL" value=""/> + </mapAttribute> + <mapAttribute key="Metamodels"> + <mapEntry key="ATL" value="http://www.eclipse.org/gmt/2005/ATL"/> + <mapEntry key="EMFTVM" value="http://www.eclipse.org/m2m/atl/2011/EMFTVM"/> + <mapEntry key="Problem" value="http://www.eclipse.org/gmt/2005/Problem"/> + </mapAttribute> + <stringAttribute key="Module Name" value="ATLtoEMFTVM"/> + <stringAttribute key="Module Path" value="/org.eclipse.m2m.atl.emftvm.compiler/transformations/"/> + <mapAttribute key="Output Model Options"> + <mapEntry key="OUT" value="derivedFile"/> + <mapEntry key="PBS" value="derivedFile"/> + </mapAttribute> + <mapAttribute key="Output Models"> + <mapEntry key="OUT" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/ATLtoEMFTVM.emftvm"/> + <mapEntry key="PBS" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/ATLtoEMFTVM-problems.xmi"/> + </mapAttribute> + <listAttribute key="Superimpose"> + <listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLtoEMFTVM.asm"/> + <listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/OCLLib.asm"/> + <listEntry value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/ATLSearchPlan.asm"/> + </listAttribute> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> </launchConfiguration> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/Bug580300.launch b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/Bug580300.launch new file mode 100644 index 00000000..df8c0087 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/Bug580300.launch @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.m2m.atl.emftvm.launcher.EMFTVMTransformation"> + <stringAttribute key="ATL File Name" value="//org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300.atl"/> + <booleanAttribute key="Disable JIT compiler" value="false"/> + <booleanAttribute key="Display Profiling Data" value="false"/> + <booleanAttribute key="Display Timing Data" value="true"/> + <mapAttribute key="Inout Model Options"/> + <mapAttribute key="Inout Models"/> + <mapAttribute key="Inout Models Output Locations"/> + <mapAttribute key="Input Model Options"/> + <mapAttribute key="Input Models"> + <mapEntry key="IN" value="http://www.eclipse.org/emf/2002/Ecore"/> + </mapAttribute> + <mapAttribute key="Metamodel Options"> + <mapEntry key="ECORE" value="isMetametamodel"/> + </mapAttribute> + <mapAttribute key="Metamodels"> + <mapEntry key="ECORE" value=""/> + </mapAttribute> + <stringAttribute key="Module Name" value="Regression::Bug580300"/> + <stringAttribute key="Module Path" value="/org.eclipse.m2m.atl.emftvm.tests/test-data/"/> + <mapAttribute key="Output Model Options"> + <mapEntry key="OUT" value="derivedFile"/> + </mapAttribute> + <mapAttribute key="Output Models"> + <mapEntry key="OUT" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300-out.ecore"/> + </mapAttribute> + <listAttribute key="Superimpose"/> +</launchConfiguration> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/CompilerTest.launch b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/CompilerTest.launch index 63660fc6..fbdeae86 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/CompilerTest.launch +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/CompilerTest.launch @@ -1,42 +1,44 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<booleanAttribute key="append.args" value="true"/> -<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> -<booleanAttribute key="askclear" value="false"/> -<booleanAttribute key="automaticAdd" value="true"/> -<booleanAttribute key="automaticValidate" value="false"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> -<booleanAttribute key="default" value="true"/> -<booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/CompilerTest.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.m2m.atl.emftvm.tests.compiler.CompilerTest"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.m2m.atl.emftvm.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m -ea"/> -<stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.platform.ide"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<booleanAttribute key="show_selected_only" value="false"/> -<booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> -<booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="useDefaultConfigArea" value="false"/> -<booleanAttribute key="useProduct" value="false"/> + <booleanAttribute key="append.args" value="true"/> + <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> + <booleanAttribute key="askclear" value="false"/> + <booleanAttribute key="automaticAdd" value="true"/> + <booleanAttribute key="automaticValidate" value="false"/> + <stringAttribute key="bootstrap" value=""/> + <stringAttribute key="checked" value="[NONE]"/> + <booleanAttribute key="clearConfig" value="true"/> + <booleanAttribute key="clearws" value="true"/> + <booleanAttribute key="clearwslog" value="false"/> + <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> + <booleanAttribute key="default" value="true"/> + <booleanAttribute key="includeOptional" value="true"/> + <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> + <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> + <listEntry value="/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/CompilerTest.java"/> + </listAttribute> + <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> + <listEntry value="1"/> + </listAttribute> + <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> + <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> + <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> + <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/> + <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/justj"/> + <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.m2m.atl.emftvm.tests.compiler.CompilerTest"/> + <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> + <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.m2m.atl.emftvm.tests"/> + <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> + <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx1024m -ea"/> + <stringAttribute key="pde.version" value="3.3"/> + <stringAttribute key="product" value="org.eclipse.platform.ide"/> + <booleanAttribute key="run_in_ui_thread" value="true"/> + <booleanAttribute key="show_selected_only" value="false"/> + <booleanAttribute key="tracing" value="false"/> + <booleanAttribute key="useCustomFeatures" value="false"/> + <booleanAttribute key="useDefaultConfig" value="true"/> + <booleanAttribute key="useDefaultConfigArea" value="false"/> + <booleanAttribute key="useProduct" value="false"/> </launchConfiguration> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/EmftvmAllTests.launch b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/EmftvmAllTests.launch index d3a172d2..17bf1cf5 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/EmftvmAllTests.launch +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/EmftvmAllTests.launch @@ -1,42 +1,46 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<booleanAttribute key="append.args" value="true"/> -<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> -<booleanAttribute key="askclear" value="false"/> -<booleanAttribute key="automaticAdd" value="true"/> -<booleanAttribute key="automaticValidate" value="false"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> -<booleanAttribute key="default" value="true"/> -<booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmAllTests.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.m2m.atl.emftvm.tests.EmftvmAllTests"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.m2m.atl.emftvm.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.epp.package.modeling.product"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<booleanAttribute key="show_selected_only" value="false"/> -<booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> -<booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="useDefaultConfigArea" value="false"/> -<booleanAttribute key="useProduct" value="false"/> + <booleanAttribute key="append.args" value="true"/> + <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> + <booleanAttribute key="askclear" value="false"/> + <booleanAttribute key="automaticAdd" value="true"/> + <booleanAttribute key="automaticValidate" value="false"/> + <stringAttribute key="bootstrap" value=""/> + <stringAttribute key="checked" value="[NONE]"/> + <booleanAttribute key="clearConfig" value="true"/> + <booleanAttribute key="clearws" value="true"/> + <booleanAttribute key="clearwslog" value="false"/> + <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> + <booleanAttribute key="default" value="true"/> + <booleanAttribute key="includeOptional" value="true"/> + <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> + <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> + <listEntry value="/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmAllTests.java"/> + </listAttribute> + <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> + <listEntry value="1"/> + </listAttribute> + <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> + <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> + <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> + <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> + <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> + <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.m2m.atl.emftvm.tests.EmftvmAllTests"/> + <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> + <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.m2m.atl.emftvm.tests"/> + <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> + <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m -ea"/> + <stringAttribute key="pde.version" value="3.3"/> + <stringAttribute key="product" value="org.eclipse.epp.package.modeling.product"/> + <booleanAttribute key="run_in_ui_thread" value="true"/> + <booleanAttribute key="show_selected_only" value="false"/> + <booleanAttribute key="tracing" value="false"/> + <booleanAttribute key="useCustomFeatures" value="false"/> + <booleanAttribute key="useDefaultConfig" value="true"/> + <booleanAttribute key="useDefaultConfigArea" value="false"/> + <booleanAttribute key="useProduct" value="false"/> </launchConfiguration> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/launch/InlineCodeblocks SearchPlanTest.launch b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/InlineCodeblocks SearchPlanTest.launch new file mode 100644 index 00000000..5fa50327 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/launch/InlineCodeblocks SearchPlanTest.launch @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.m2m.atl.emftvm.launcher.EMFTVMTransformation"> + <stringAttribute key="ATL File Name" value="//org.eclipse.m2m.atl.emftvm.compiler/transformations/InlineCodeblocks.atl"/> + <booleanAttribute key="Disable JIT compiler" value="false"/> + <booleanAttribute key="Display Profiling Data" value="false"/> + <booleanAttribute key="Display Timing Data" value="true"/> + <mapAttribute key="Inout Model Options"> + <mapEntry key="IN" value="derivedFile"/> + </mapAttribute> + <mapAttribute key="Inout Models"> + <mapEntry key="IN" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.emftvm"/> + </mapAttribute> + <mapAttribute key="Inout Models Output Locations"> + <mapEntry key="IN" value="platform:/resource/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest-inlined.emftvm"/> + </mapAttribute> + <mapAttribute key="Input Model Options"/> + <mapAttribute key="Input Models"/> + <mapAttribute key="Metamodel Options"/> + <mapAttribute key="Metamodels"> + <mapEntry key="EMFTVM" value="http://www.eclipse.org/m2m/atl/2011/EMFTVM"/> + </mapAttribute> + <stringAttribute key="Module Name" value="InlineCodeblocks"/> + <stringAttribute key="Module Path" value="/org.eclipse.m2m.atl.emftvm.compiler/transformations/"/> + <mapAttribute key="Output Model Options"/> + <mapAttribute key="Output Models"/> + <listAttribute key="Superimpose"/> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> + <booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/> + <booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/> + <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> +</launchConfiguration> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/pom.xml b/tests/org.eclipse.m2m.atl.emftvm.tests/pom.xml index c41213c1..716c53ee 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/pom.xml +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -18,12 +18,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.tests</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> @@ -66,6 +66,9 @@ <emftvm.compile module="EcoreCopy" modulepath="${basedir}/test-data/EcoreCopy/" outputpath="${basedir}/target/" charset="UTF-8" /> + <emftvm.compile outputpath="${basedir}/target/" charset="UTF-8"> + <moduleset dir="${basedir}/test-data/EcoreCopy/" includes="*.atl"/> + </emftvm.compile> <echo message="Loading metamodel ECORE" /> <emftvm.loadMetamodel name="ECORE" uri="http://www.eclipse.org/emf/2002/Ecore" /> @@ -74,8 +77,7 @@ uri="file:/${basedir}/../../plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.ecore" /> <echo message="Running file:/${basedir}/target/EcoreCopy.emftvm" /> - <emftvm.run modulepath="file:/${basedir}/target/" - module="EcoreCopy"> + <emftvm.run modulepath="file:/${basedir}/target/" module="EcoreCopy"> <metamodel name="ECORE" /> <inputmodel name="EMFTVM" as="IN" /> <outputmodel name="EMFTVM-OUT" as="OUT" @@ -83,6 +85,15 @@ </emftvm.run> <echo message="Saving model EMFTVM-OUT" /> <emftvm.saveModel name="EMFTVM-OUT" /> + <echo + message="Batch running file:/${basedir}/target/EcoreCopy.emftvm" /> + <emftvm.run modulepath="file:/${basedir}/target/" module="EcoreCopy"> + <metamodel name="ECORE" /> + <inputmodelset name="IN" dir="${basedir}/../../plugins/org.eclipse.m2m.atl.emftvm/model"> + <include name="*.ecore" /> + </inputmodelset> + <outputmodelset name="OUT" dir="${basedir}/target/" suffix=".ecore" /> + </emftvm.run> </tasks> </configuration> </execution> @@ -116,7 +127,7 @@ <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> - <version>[3.0,3.1)</version> + <version>[3.2,3.3)</version> </dependency> <dependency> <groupId>org.eclipse.m2m.atl</groupId> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AddTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AddTest.java index 2d69fae0..0308b008 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AddTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AddTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AllinstInTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AllinstInTest.java index 5e27d2e2..44c1ffc5 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AllinstInTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AllinstInTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AllinstTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AllinstTest.java index 1f342be5..0a6dfee4 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AllinstTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AllinstTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AndTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AndTest.java index 5862063d..24aa8937 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AndTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/AndTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/BranchInstructionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/BranchInstructionTest.java index 30d80f33..f1d6a5e4 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/BranchInstructionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/BranchInstructionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/CodeBlockInstructionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/CodeBlockInstructionTest.java index 8331c001..a1694e61 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/CodeBlockInstructionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/CodeBlockInstructionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/CodeBlockTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/CodeBlockTest.java index dbfd6248..05572792 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/CodeBlockTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/CodeBlockTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DeleteTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DeleteTest.java index 97e1018c..a7946a7e 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DeleteTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DeleteTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DupTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DupTest.java index f4ab988f..119a47d0 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DupTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DupTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DupX1Test.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DupX1Test.java index 417e604f..6c21847e 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DupX1Test.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/DupX1Test.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EMFTVMTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EMFTVMTest.java index dcaa1545..c3b9cdc2 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EMFTVMTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EMFTVMTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2013 Dennis Wagelaar. + * Copyright (c) 2013, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -16,8 +16,6 @@ import java.util.Iterator; import java.util.SortedSet; import java.util.logging.Logger; -import junit.framework.TestCase; - import org.eclipse.core.runtime.Platform; import org.eclipse.emf.common.util.BasicMonitor; import org.eclipse.emf.common.util.URI; @@ -43,9 +41,11 @@ import org.eclipse.m2m.atl.emftvm.util.EMFTVMUtil; import org.eclipse.m2m.atl.emftvm.util.ModuleResolver; import org.osgi.framework.Bundle; +import junit.framework.TestCase; + /** * Abstract unit test base class for EMFTVM. - * + * * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> */ public abstract class EMFTVMTest extends TestCase { @@ -65,13 +65,13 @@ public abstract class EMFTVMTest extends TestCase { /** * Asserts that leftResource and rightResource are equal. Uses EMF Compare. - * + * * @param leftResource * the left-hand resource to compare * @param rightResource * the right-hand resource to compare */ - public static void assertEquals(Resource leftResource, Resource rightResource) { + public static void assertEquals(final Resource leftResource, final Resource rightResource) { final BasicMonitor monitor = new BasicMonitor(); final DefaultComparisonScope scope = new DefaultComparisonScope(leftResource, rightResource, null); final Comparison match = DefaultMatchEngine.create(UseIdentifiers.NEVER).match(scope, monitor); @@ -79,7 +79,7 @@ public abstract class EMFTVMTest extends TestCase { assertFalse("Match model is empty: " + match.getMatches(), match.getMatches().isEmpty()); } new DefaultDiffEngine(new DiffBuilder()).diff(match, monitor); - for (Diff diff : match.getDifferences()) { + for (final Diff diff : match.getDifferences()) { // allow only certain kinds of diff elements if (diff instanceof ReferenceChange && ((ReferenceChange) diff).getKind() == DifferenceKind.CHANGE) { assertEquals(diff.getMatch().getLeft(), diff.getMatch().getRight(), ((ReferenceChange) diff).getReference()); @@ -91,7 +91,7 @@ public abstract class EMFTVMTest extends TestCase { /** * Asserts that <code>left.ref</code> and <code>right.ref</code> point to equal values. - * + * * @param left * the left-hand object to compare * @param right @@ -106,7 +106,7 @@ public abstract class EMFTVMTest extends TestCase { final String errorMsg = String.format("Different value found on %s.%s (%s) and %s.%s (%s)", EMFTVMUtil.toPrettyString(left, null), ref.getName(), EMFTVMUtil.toPrettyString(leftValue, null), EMFTVMUtil.toPrettyString(right, null), ref.getName(), EMFTVMUtil.toPrettyString(rightValue, null)); - + assertEquals(errorMsg, leftValue.size(), rightValue.size()); final Iterator<?> leftVs = leftValue.iterator(); final Iterator<?> rightVs = rightValue.iterator(); @@ -127,7 +127,7 @@ public abstract class EMFTVMTest extends TestCase { /** * Asserts that <code>leftValue</code> and <code>rightValue</code> have the same EMF URI. - * + * * @param errorMsg * the error message to display on assertion failure * @param leftValue @@ -136,15 +136,15 @@ public abstract class EMFTVMTest extends TestCase { * the right-hand value to compare */ private static void assertSameURI(final String errorMsg, final EObject leftValue, final EObject rightValue) { - assertEquals(errorMsg, leftValue == null ? null : leftValue.eResource().getURI(), + assertEquals(errorMsg, leftValue == null ? null : leftValue.eResource().getURI(), rightValue == null ? null : rightValue.eResource().getURI()); - assertEquals(errorMsg, leftValue == null ? null : leftValue.eResource().getURIFragment(leftValue), + assertEquals(errorMsg, leftValue == null ? null : leftValue.eResource().getURIFragment(leftValue), rightValue == null ? null : rightValue.eResource().getURIFragment(rightValue)); } /** * Processes and logs timing statistics. - * + * * @param prefix * the log message prefix string * @param timings @@ -162,7 +162,7 @@ public abstract class EMFTVMTest extends TestCase { long max = 0L; long min = Long.MAX_VALUE; int i = 0; - for (long timing : timings) { + for (final long timing : timings) { max = Math.max(max, timing); min = Math.min(min, timing); i++; @@ -182,7 +182,7 @@ public abstract class EMFTVMTest extends TestCase { long pureMax = 0L; long pureMin = Long.MAX_VALUE; i = 0; - for (long timing : pureTimings) { + for (final long timing : pureTimings) { pureMax = Math.max(pureMax, timing); pureMin = Math.min(pureMin, timing); i++; @@ -199,10 +199,10 @@ public abstract class EMFTVMTest extends TestCase { final Runtime runtime = Runtime.getRuntime(); LOG.info(String.format( new StringBuilder("%s\n\tDuration (msec)\tOverall runtime\tPure runtime (without loading)\n") - .append("\tMinimum time:\t%f\t%f\n").append("\tFirst quartile:\t%f\t%f\n").append("\tMedian time:\t%f\t%f\n") - .append("\tThird quartile:\t%f\t%f\n").append("\tMaximum time:\t%f\t%f\n") - .append("\tTransactions per second (median):\t%f\ton\t%d\tthread(s)\n").append("\tHeap space used:\t%d\tMB") - .toString(), prefix, min / 1E6, pureMin / 1E6, firstQuartile / 1E6, pureFirstQuartile / 1E6, median / 1E6, + .append("\tMinimum time:\t%f\t%f\n").append("\tFirst quartile:\t%f\t%f\n").append("\tMedian time:\t%f\t%f\n") + .append("\tThird quartile:\t%f\t%f\n").append("\tMaximum time:\t%f\t%f\n") + .append("\tTransactions per second (median):\t%f\ton\t%d\tthread(s)\n").append("\tHeap space used:\t%d\tMB") + .toString(), prefix, min / 1E6, pureMin / 1E6, firstQuartile / 1E6, pureFirstQuartile / 1E6, median / 1E6, pureMedian / 1E6, thirdQuartile / 1E6, pureThirdQuartile / 1E6, max / 1E6, pureMax / 1E6, 1E9 * threadCount / median, threadCount, (runtime.totalMemory() - runtime.freeMemory()) / (1024 * 1024))); } @@ -216,17 +216,17 @@ public abstract class EMFTVMTest extends TestCase { /** * Creates a new {@link EMFTVMTest}. - * + * * @param name * the test name */ - public EMFTVMTest(String name) { + public EMFTVMTest(final String name) { super(name); } /** * Loads a {@link Model} instance for the given file name. - * + * * @param rs * the {@link ResourceSet} to use for loading * @param file @@ -234,14 +234,13 @@ public abstract class EMFTVMTest extends TestCase { * @return the {@link Model} instance for the given file name */ public Model loadTestModel(final ResourceSet rs, final String file) { - final Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + file, true), true)); - return model; + final Resource resource = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + file, true), true); + return EmftvmFactory.eINSTANCE.createModel(resource); } /** * Loads a {@link Metamodel} instance for the given file name. - * + * * @param rs * the {@link ResourceSet} to use for loading * @param file @@ -249,14 +248,13 @@ public abstract class EMFTVMTest extends TestCase { * @return the {@link Metamodel} instance for the given file name */ public Metamodel loadTestMetamodel(final ResourceSet rs, final String file) { - final Metamodel model = EmftvmFactory.eINSTANCE.createMetamodel(); - model.setResource(rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + file, true), true)); - return model; + final Resource resource = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + file, true), true); + return EmftvmFactory.eINSTANCE.createMetamodel(resource); } /** * Creates a new {@link Model} instance for the given file name. - * + * * @param rs * the {@link ResourceSet} to use for creating * @param file @@ -264,14 +262,13 @@ public abstract class EMFTVMTest extends TestCase { * @return the {@link Model} instance for the given file name */ public Model createTestModel(final ResourceSet rs, final String file) { - final Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(rs.createResource(URI.createPlatformPluginURI(PLUGIN_ID + file, true))); - return model; + final Resource resource = rs.createResource(URI.createPlatformPluginURI(PLUGIN_ID + file, true)); + return EmftvmFactory.eINSTANCE.createModel(resource); } /** * Creates a new {@link ModuleResolver} for testing. Uses {@value #PLUGIN_URI} + "/test-data/" as module path. - * + * * @return a new {@link ModuleResolver} for testing */ public ModuleResolver createTestModuleResolver() { diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmAllTests.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmAllTests.java index 31694d85..0f243a15 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmAllTests.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmAllTests.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. + * Copyright (c) 2023 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -18,12 +19,16 @@ import org.eclipse.m2m.atl.emftvm.tests.performance.ATLtoEMFTVMPerformanceTest; import org.eclipse.m2m.atl.emftvm.tests.performance.EcoreCopyPerformanceTest; import org.eclipse.m2m.atl.emftvm.tests.pojo.PojoModelTest; import org.eclipse.m2m.atl.emftvm.util.tests.ExecEnvPoolTest; +import org.eclipse.m2m.atl.emftvm.util.tests.LazyBagNoCacheTest; import org.eclipse.m2m.atl.emftvm.util.tests.LazyBagOnCollectionTest; import org.eclipse.m2m.atl.emftvm.util.tests.LazyBagTest; +import org.eclipse.m2m.atl.emftvm.util.tests.LazyListNoCacheTest; import org.eclipse.m2m.atl.emftvm.util.tests.LazyListOnCollectionTest; import org.eclipse.m2m.atl.emftvm.util.tests.LazyListOnListTest; import org.eclipse.m2m.atl.emftvm.util.tests.LazyListTest; +import org.eclipse.m2m.atl.emftvm.util.tests.LazyOrderedSetNoCacheTest; import org.eclipse.m2m.atl.emftvm.util.tests.LazyOrderedSetTest; +import org.eclipse.m2m.atl.emftvm.util.tests.LazySetNoCacheTest; import org.eclipse.m2m.atl.emftvm.util.tests.LazySetOnSetTest; import org.eclipse.m2m.atl.emftvm.util.tests.LazySetTest; import org.eclipse.m2m.atl.emftvm.util.tests.OCLOperationsTest; @@ -48,7 +53,7 @@ public class EmftvmAllTests extends TestSuite { * <!-- end-user-doc --> * @generated */ - public static void main(String[] args) { + public static void main(final String[] args) { TestRunner.run(suite()); } @@ -58,16 +63,20 @@ public class EmftvmAllTests extends TestSuite { * @generated NOT */ public static Test suite() { - TestSuite suite = new EmftvmAllTests("Emftvm Tests"); + final TestSuite suite = new EmftvmAllTests("Emftvm Tests"); suite.addTest(EmftvmTests.suite()); suite.addTestSuite(LazyListTest.class); + suite.addTestSuite(LazyListNoCacheTest.class); suite.addTestSuite(LazyListOnCollectionTest.class); suite.addTestSuite(LazyListOnListTest.class); suite.addTestSuite(LazyBagTest.class); + suite.addTestSuite(LazyBagNoCacheTest.class); suite.addTestSuite(LazyBagOnCollectionTest.class); suite.addTestSuite(LazySetTest.class); + suite.addTestSuite(LazySetNoCacheTest.class); suite.addTestSuite(LazySetOnSetTest.class); suite.addTestSuite(LazyOrderedSetTest.class); + suite.addTestSuite(LazyOrderedSetNoCacheTest.class); suite.addTestSuite(ExecEnvPoolTest.class); suite.addTestSuite(OCLOperationsTest.class); suite.addTestSuite(StackFrameTest.class); @@ -86,7 +95,7 @@ public class EmftvmAllTests extends TestSuite { * <!-- end-user-doc --> * @generated */ - public EmftvmAllTests(String name) { + public EmftvmAllTests(final String name) { super(name); } diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmExample.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmExample.java index bb6e2184..bfd7e41a 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmExample.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmExample.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmTests.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmTests.java index 4367a38e..eb41fb01 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmTests.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EmftvmTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EnditerateTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EnditerateTest.java index 6f504076..d64de299 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EnditerateTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EnditerateTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ExecEnvTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ExecEnvTest.java index 77e5cdff..75f534a5 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ExecEnvTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ExecEnvTest.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and @@ -16,8 +17,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import junit.textui.TestRunner; - import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; @@ -56,6 +55,8 @@ import org.eclipse.m2m.atl.emftvm.util.Types; import org.eclipse.m2m.atl.emftvm.util.VMException; import org.eclipse.m2m.atl.emftvm.util.VMMonitor; +import junit.textui.TestRunner; + /** * <!-- begin-user-doc --> @@ -128,7 +129,7 @@ import org.eclipse.m2m.atl.emftvm.util.VMMonitor; * @generated NOT */ public class ExecEnvTest extends EMFTVMTest { - + private static final Logger LOG = Logger.getLogger(ExecEnvTest.class.getName()); /** @@ -144,7 +145,7 @@ public class ExecEnvTest extends EMFTVMTest { * <!-- end-user-doc --> * @generated */ - public static void main(String[] args) { + public static void main(final String[] args) { TestRunner.run(ExecEnvTest.class); } @@ -154,7 +155,7 @@ public class ExecEnvTest extends EMFTVMTest { * <!-- end-user-doc --> * @generated */ - public ExecEnvTest(String name) { + public ExecEnvTest(final String name) { super(name); } @@ -164,7 +165,7 @@ public class ExecEnvTest extends EMFTVMTest { * <!-- end-user-doc --> * @generated */ - protected void setFixture(ExecEnv fixture) { + protected void setFixture(final ExecEnv fixture) { this.fixture = fixture; } @@ -342,16 +343,16 @@ public class ExecEnvTest extends EMFTVMTest { assertEquals(this, env.getMonitor()); terminated = true; } - public void step(StackFrame frame) { + public void step(final StackFrame frame) { } - public void leave(StackFrame frame) { + public void leave(final StackFrame frame) { } public boolean isTerminated() { return terminated; } - public void error(StackFrame frame, String msg, Exception e) { + public void error(final StackFrame frame, final String msg, final Exception e) { } - public void enter(StackFrame frame) { + public void enter(final StackFrame frame) { } }; @@ -359,7 +360,7 @@ public class ExecEnvTest extends EMFTVMTest { final Module dummyModule = createDummyModule(); // Load module final ModuleResolver mr = new ModuleResolver() { - public Module resolveModule(String name) throws ModuleNotFoundException { + public Module resolveModule(final String name) throws ModuleNotFoundException { return dummyModule; } }; @@ -385,16 +386,16 @@ public class ExecEnvTest extends EMFTVMTest { final VMMonitor monitor = new VMMonitor() { public void terminated() { } - public void step(StackFrame frame) { + public void step(final StackFrame frame) { } - public void leave(StackFrame frame) { + public void leave(final StackFrame frame) { } public boolean isTerminated() { return false; } - public void error(StackFrame frame, String msg, Exception e) { + public void error(final StackFrame frame, final String msg, final Exception e) { } - public void enter(StackFrame frame) { + public void enter(final StackFrame frame) { } }; getFixture().setMonitor(monitor); @@ -414,8 +415,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load metamodel final Resource portsRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Ports.ecore", true), true); - final Metamodel metaModel = EmftvmFactory.eINSTANCE.createMetamodel(); - metaModel.setResource(portsRes); + final Metamodel metaModel = EmftvmFactory.eINSTANCE.createMetamodel(portsRes); env.registerMetaModel("PORTS", metaModel); assertTrue(env.getMetaModels().containsKey("PORTS")); @@ -435,8 +435,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load and register model final Resource res = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestLib.emftvm", true), true); - final Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(res); + final Model model = EmftvmFactory.eINSTANCE.createModel(res); env.registerInputModel("M", model); assertTrue(env.getInputModels().containsKey("M")); @@ -455,25 +454,23 @@ public class ExecEnvTest extends EMFTVMTest { final ResourceSet rs = new ResourceSetImpl(); { - // Load and register model - final Resource res = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestLib.emftvm", true), true); - final Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(res); - env.registerInOutModel("M", model); + // Load and register model + final Resource res = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestLib.emftvm", true), true); + final Model model = EmftvmFactory.eINSTANCE.createModel(res); + env.registerInOutModel("M", model); - assertTrue(env.getInoutModels().containsKey("M")); - assertEquals(model, env.getInoutModels().get("M")); + assertTrue(env.getInoutModels().containsKey("M")); + assertEquals(model, env.getInoutModels().get("M")); } { - // Load and register model - final Resource res = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestLib.emftvm", true), true); - final Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(res); - env.registerInOutModel("M", model); + // Load and register model + final Resource res = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestLib.emftvm", true), true); + final Model model = EmftvmFactory.eINSTANCE.createModel(res); + env.registerInOutModel("M", model); - assertTrue(env.getInoutModels().containsKey("M")); - assertEquals(model, env.getInoutModels().get("M")); + assertTrue(env.getInoutModels().containsKey("M")); + assertEquals(model, env.getInoutModels().get("M")); } } @@ -490,26 +487,23 @@ public class ExecEnvTest extends EMFTVMTest { // Load and register input model final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestLib.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); assertTrue(env.getInputModels().containsKey("IN")); assertEquals(inModel, env.getInputModels().get("IN")); // Load and register in/out model final Resource inOutRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestLib.emftvm", true), true); - final Model inOutModel = EmftvmFactory.eINSTANCE.createModel(); - inOutModel.setResource(inOutRes); + final Model inOutModel = EmftvmFactory.eINSTANCE.createModel(inOutRes); env.registerInOutModel("INOUT", inOutModel); assertTrue(env.getInoutModels().containsKey("INOUT")); assertEquals(inOutModel, env.getInoutModels().get("INOUT")); // Create and register output model final Resource outRes = rs.createResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/out.xmi", true)); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); assertTrue(env.getOutputModels().containsKey("OUT")); assertEquals(outModel, env.getOutputModels().get("OUT")); - + env.clearModels(); assertFalse(env.getInputModels().containsKey("IN")); assertFalse(env.getInoutModels().containsKey("INOUT")); @@ -529,8 +523,7 @@ public class ExecEnvTest extends EMFTVMTest { // Create and register model final Resource res = rs.createResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/out.xmi", true)); - final Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(res); + final Model model = EmftvmFactory.eINSTANCE.createModel(res); env.registerOutputModel("M", model); assertTrue(env.getOutputModels().containsKey("M")); @@ -550,8 +543,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load metamodel final Resource portsRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Ports.ecore", true), true); - final Metamodel metaModel = EmftvmFactory.eINSTANCE.createMetamodel(); - metaModel.setResource(portsRes); + final Metamodel metaModel = EmftvmFactory.eINSTANCE.createMetamodel(portsRes); env.registerMetaModel("PORTS", metaModel); final Metamodel mm = env.getMetaModel(portsRes); @@ -573,18 +565,17 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); - + final CodeBlock element = (CodeBlock) inModel.allInstancesOf(EmftvmPackage.eINSTANCE.getCodeBlock()).first(); env.queueForSet(EmftvmPackage.eINSTANCE.getCodeBlock_MaxLocals(), element, 2, new StackFrame(env, EmftvmFactory.eINSTANCE.createCodeBlock())); - + assertFalse(element.getMaxLocals() == 2); - + env.setQueue(); - + assertEquals(2, element.getMaxLocals()); } @@ -601,22 +592,21 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); - + // Load module with some fields env.loadModule(new DefaultModuleResolver(PLUGIN_URI + "/test-data/", rs), "TestQuery"); - + final Operation element = (Operation) inModel.allInstancesOf(EmftvmPackage.eINSTANCE.getOperation()).first(); final Field field = env.findField(element.eClass(), "testProp"); env.queueForSet(field, element, Boolean.FALSE, new StackFrame(env, EmftvmFactory.eINSTANCE.createCodeBlock())); - + assertNull(field.getValue(element)); - + env.setQueue(); - + assertEquals(Boolean.FALSE, field.getValue(element)); } @@ -633,19 +623,18 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Ports.ecore", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); - + final EObject element = inModel.allInstancesOf(EcorePackage.eINSTANCE.getEClass()).first(); final String xmiID = "_a01"; env.queueXmiIDForSet(element, xmiID, new StackFrame(env, EmftvmFactory.eINSTANCE.createCodeBlock())); - + assertNull(((XMIResource)inRes).getID(element)); - + env.setQueue(); - + assertEquals(xmiID, ((XMIResource)inRes).getID(element)); } @@ -662,8 +651,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.createResource(URI.createURI("local.xmi")); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); final CodeBlock element = EmftvmFactory.eINSTANCE.createCodeBlock(); @@ -712,7 +700,7 @@ public class ExecEnvTest extends EMFTVMTest { try { env.setQueue(); fail("Expected VMException"); - } catch (VMException e) { + } catch (final VMException e) { // expected assertTrue(e.getCause() instanceof IndexOutOfBoundsException); } @@ -722,7 +710,7 @@ public class ExecEnvTest extends EMFTVMTest { try { env.setQueue(); fail("Expected VMException"); - } catch (VMException e) { + } catch (final VMException e) { // expected assertTrue(e.getCause() instanceof IllegalArgumentException); } @@ -732,7 +720,7 @@ public class ExecEnvTest extends EMFTVMTest { * Tests the ' * {@link org.eclipse.m2m.atl.emftvm.ExecEnv#queueForAdd(org.eclipse.m2m.atl.emftvm.Field, java.lang.Object, java.lang.Object, int, org.eclipse.m2m.atl.emftvm.util.StackFrame) * <em>Queue For Add</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.m2m.atl.emftvm.ExecEnv#queueForAdd(org.eclipse.m2m.atl.emftvm.Field, java.lang.Object, java.lang.Object, int, * org.eclipse.m2m.atl.emftvm.util.StackFrame) * @generated NOT @@ -745,21 +733,17 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource portsRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Ports.ecore", true), true); - final Metamodel portsModel = EmftvmFactory.eINSTANCE.createMetamodel(); - portsModel.setResource(portsRes); + final Metamodel portsModel = EmftvmFactory.eINSTANCE.createMetamodel(portsRes); env.registerMetaModel("Ports", portsModel); final Resource pinsRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Pins.ecore", true), true); - final Metamodel pinsModel = EmftvmFactory.eINSTANCE.createMetamodel(); - pinsModel.setResource(pinsRes); + final Metamodel pinsModel = EmftvmFactory.eINSTANCE.createMetamodel(pinsRes); env.registerMetaModel("Pins", pinsModel); final Resource inRes = rs.createResource(URI.createURI("local.xmi")); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); final Resource outRes = rs.createResource(URI.createURI("local2.xmi")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerInOutModel("OUT", outModel); // Load module with some fields @@ -785,8 +769,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); // Load module with some fields @@ -800,7 +783,7 @@ public class ExecEnvTest extends EMFTVMTest { try { env.setQueue(); fail("Expected VMException"); - } catch (VMException e) { + } catch (final VMException e) { // expected assertTrue(e.getCause() instanceof IllegalArgumentException); // field has been lazily initialised @@ -829,8 +812,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Ports.ecore", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); final EObject element = inModel.allInstancesOf(EcorePackage.eINSTANCE.getEClass()).first(); @@ -858,8 +840,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.createResource(URI.createURI("local.xmi")); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); final CodeBlock element = EmftvmFactory.eINSTANCE.createCodeBlock(); @@ -921,21 +902,17 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource portsRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Ports.ecore", true), true); - final Metamodel portsModel = EmftvmFactory.eINSTANCE.createMetamodel(); - portsModel.setResource(portsRes); + final Metamodel portsModel = EmftvmFactory.eINSTANCE.createMetamodel(portsRes); env.registerMetaModel("Ports", portsModel); final Resource pinsRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Pins.ecore", true), true); - final Metamodel pinsModel = EmftvmFactory.eINSTANCE.createMetamodel(); - pinsModel.setResource(pinsRes); + final Metamodel pinsModel = EmftvmFactory.eINSTANCE.createMetamodel(pinsRes); env.registerMetaModel("Pins", pinsModel); final Resource inRes = rs.createResource(URI.createURI("local.xmi")); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); final Resource outRes = rs.createResource(URI.createURI("local2.xmi")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerInOutModel("OUT", outModel); // Load module with some fields @@ -968,8 +945,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); // Load module with some fields @@ -1007,8 +983,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Ports.ecore", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); final EObject element = inModel.allInstancesOf(EcorePackage.eINSTANCE.getEClass()).first(); @@ -1048,8 +1023,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); final CodeBlock element = (CodeBlock) inModel.allInstancesOf(EmftvmPackage.eINSTANCE.getCodeBlock()).first(); @@ -1074,7 +1048,7 @@ public class ExecEnvTest extends EMFTVMTest { /** * Tests the '{@link org.eclipse.m2m.atl.emftvm.ExecEnv#remapQueue() <em>Remap Queue</em>}' operation. <!-- begin-user-doc --> <!-- * end-user-doc --> - * + * * @see org.eclipse.m2m.atl.emftvm.ExecEnv#remapQueue() * @generated NOT */ @@ -1120,7 +1094,7 @@ public class ExecEnvTest extends EMFTVMTest { try { env.loadModule(mr, "AbstractTargetClass"); fail("Expected VMException"); - } catch (VMException e) { + } catch (final VMException e) { // Expected ATLLogger.info(e.getMessage()); } @@ -1208,13 +1182,13 @@ public class ExecEnvTest extends EMFTVMTest { final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); // Create and register operation - final Operation op = EMFTVMUtil.createOperation(true, "test", Types.EXEC_ENV_TYPE, Types.OCL_ANY_TYPE, + final Operation op = EMFTVMUtil.createOperation(true, "test", Types.EXEC_ENV_TYPE, Types.OCL_ANY_TYPE, new String[][][]{}, new NativeCodeBlock()); final Module module = EmftvmFactory.eINSTANCE.createModule(); module.setName("testmodule"); module.getFeatures().add(op); env.loadModule(new ModuleResolver() { - public Module resolveModule(String name) throws ModuleNotFoundException { + public Module resolveModule(final String name) throws ModuleNotFoundException { return module; } }, "testmodule"); @@ -1235,13 +1209,13 @@ public class ExecEnvTest extends EMFTVMTest { final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); // Create and register operation - final Operation op = EMFTVMUtil.createOperation(true, "test", Types.EXEC_ENV_TYPE, Types.OCL_ANY_TYPE, + final Operation op = EMFTVMUtil.createOperation(true, "test", Types.EXEC_ENV_TYPE, Types.OCL_ANY_TYPE, new String[][][]{{{"var"}, Types.OCL_ANY_TYPE}}, new NativeCodeBlock()); final Module module = EmftvmFactory.eINSTANCE.createModule(); module.setName("testmodule"); module.getFeatures().add(op); env.loadModule(new ModuleResolver() { - public Module resolveModule(String name) throws ModuleNotFoundException { + public Module resolveModule(final String name) throws ModuleNotFoundException { return module; } }, "testmodule"); @@ -1287,7 +1261,7 @@ public class ExecEnvTest extends EMFTVMTest { assertNull(env.findField(EmftvmPackage.eINSTANCE.getExecEnv(), "field")); env.loadModule(new ModuleResolver() { - public Module resolveModule(String name) throws ModuleNotFoundException { + public Module resolveModule(final String name) throws ModuleNotFoundException { return m; } }, "test"); @@ -1319,7 +1293,7 @@ public class ExecEnvTest extends EMFTVMTest { assertNull(env.findField(EmftvmPackage.eINSTANCE.getExecEnv(), "field")); env.loadModule(new ModuleResolver() { - public Module resolveModule(String name) throws ModuleNotFoundException { + public Module resolveModule(final String name) throws ModuleNotFoundException { return m; } }, "test"); @@ -1379,7 +1353,7 @@ public class ExecEnvTest extends EMFTVMTest { assertNull(env.findField(EmftvmPackage.eINSTANCE.getExecEnv(), "rule")); env.loadModule(new ModuleResolver() { - public Module resolveModule(String name) throws ModuleNotFoundException { + public Module resolveModule(final String name) throws ModuleNotFoundException { return m; } }, "test"); @@ -1401,7 +1375,7 @@ public class ExecEnvTest extends EMFTVMTest { try { final Object type = env.findType("EMFTVM", "ExecEnv"); assertEquals(EmftvmPackage.eINSTANCE.getExecEnv(), type); - } catch (ClassNotFoundException e) { + } catch (final ClassNotFoundException e) { e.printStackTrace(); fail(e.getMessage()); } @@ -1420,85 +1394,81 @@ public class ExecEnvTest extends EMFTVMTest { // Load models { - final Resource inRes = rs.getResource( - URI.createURI("../../plugins/" + COMPILER_PLUGIN_ID + "/transformations/ATLtoEMFTVM.atl", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); - env.registerInputModel("IN", inModel); + final Resource inRes = rs.getResource( + URI.createURI("../../plugins/" + COMPILER_PLUGIN_ID + "/transformations/ATLtoEMFTVM.atl", true), true); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); + env.registerInputModel("IN", inModel); } final Resource outRes = rs.createResource(URI.createFileURI("out.xmi")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); assertEquals(outModel, env.getOutputModels().get("OUT")); final Resource pbsRes = rs.createResource(URI.createFileURI("pbs.xmi")); - final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(); - pbsModel.setResource(pbsRes); + final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(pbsRes); env.registerOutputModel("PBS", pbsModel); assertEquals(pbsModel, env.getOutputModels().get("PBS")); { - final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(); - atlmm.setResource(rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true)); - env.registerMetaModel("ATL", atlmm); + final Resource atlres = rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true); + final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(atlres); + env.registerMetaModel("ATL", atlmm); } { - final Metamodel pbmm = EmftvmFactory.eINSTANCE.createMetamodel(); - pbmm.setResource(rs.getResource(URI.createPlatformPluginURI(COMMON_PLUGIN_ID + "/model/Problem.ecore", true), true)); - env.registerMetaModel("Problem", pbmm); + final Resource pbres = rs + .getResource(URI.createPlatformPluginURI(COMMON_PLUGIN_ID + "/model/Problem.ecore", true), true); + final Metamodel pbmm = EmftvmFactory.eINSTANCE.createMetamodel(pbres); + env.registerMetaModel("Problem", pbmm); } // Load and run module { - final ModuleResolver mr = new DefaultModuleResolver(COMPILER_PLUGIN_URI + "/transformations/", rs); - final TimingData td = new TimingData(); - env.loadModule(mr, "ATLtoEMFTVM"); - td.finishLoading(); - env.run(td); - td.finish(); - LOG.info("ExecEnvText#testRun__TimingData " + td.toString()); + final ModuleResolver mr = new DefaultModuleResolver(COMPILER_PLUGIN_URI + "/transformations/", rs); + final TimingData td = new TimingData(); + env.loadModule(mr, "ATLtoEMFTVM"); + td.finishLoading(); + env.run(td); + td.finish(); + LOG.info("ExecEnvText#testRun__TimingData " + td.toString()); } // Create another output model, and run the transformation again final Resource outRes2 = rs.createResource(URI.createFileURI("out2.xmi")); - final Model outModel2 = EmftvmFactory.eINSTANCE.createModel(); - outModel2.setResource(outRes2); + final Model outModel2 = EmftvmFactory.eINSTANCE.createModel(outRes2); env.registerOutputModel("OUT", outModel2); assertEquals(outModel2, env.getOutputModels().get("OUT")); final Resource pbsRes2 = rs.createResource(URI.createFileURI("pbs2.xmi")); - final Model pbsModel2 = EmftvmFactory.eINSTANCE.createModel(); - pbsModel2.setResource(pbsRes2); + final Model pbsModel2 = EmftvmFactory.eINSTANCE.createModel(pbsRes2); env.registerOutputModel("PBS", pbsModel2); assertEquals(pbsModel2, env.getOutputModels().get("PBS")); { - final TimingData td2 = new TimingData(); - td2.finishLoading(); - env.run(td2); - td2.finish(); - LOG.info("ExecEnvText#testRun__TimingData 2nd run " + td2.toString()); + final TimingData td2 = new TimingData(); + td2.finishLoading(); + env.run(td2); + td2.finish(); + LOG.info("ExecEnvText#testRun__TimingData 2nd run " + td2.toString()); } - + // Compare results assertEquals(outRes, outRes2); assertEquals(pbsRes, pbsRes2); - + // Run once more outRes2.getContents().clear(); pbsRes2.getContents().clear(); { - final TimingData td2 = new TimingData(); - td2.finishLoading(); - env.run(td2); - td2.finish(); - LOG.info("ExecEnvText#testRun__TimingData 3rd run " + td2.toString()); + final TimingData td2 = new TimingData(); + td2.finishLoading(); + env.run(td2); + td2.finish(); + LOG.info("ExecEnvText#testRun__TimingData 3rd run " + td2.toString()); } - + // Compare results assertEquals(outRes, outRes2); assertEquals(pbsRes, pbsRes2); @@ -1507,7 +1477,7 @@ public class ExecEnvTest extends EMFTVMTest { /** * Tests the '{@link org.eclipse.m2m.atl.emftvm.ExecEnv#run(org.eclipse.m2m.atl.emftvm.util.TimingData) <em>Run</em>}' operation. <!-- * begin-user-doc --> Refining mode test. <!-- end-user-doc --> - * + * * @see org.eclipse.m2m.atl.emftvm.ExecEnv#run(org.eclipse.m2m.atl.emftvm.util.TimingData) * @generated NOT */ @@ -1518,19 +1488,16 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource( URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/RefiningModeTest/EMFTVMCopy.trace", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); final Resource inoutRes = rs.getResource( URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/RefiningModeTest/RefiningModeTest.emftvm", true), true); - final Model inoutModel = EmftvmFactory.eINSTANCE.createModel(); - inoutModel.setResource(inoutRes); + final Model inoutModel = EmftvmFactory.eINSTANCE.createModel(inoutRes); env.registerInOutModel("INOUT", inoutModel); final Resource outRes = rs.createResource(URI.createFileURI("RefiningModeTest.ecore")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); assertEquals(outModel, env.getOutputModels().get("OUT")); @@ -1559,7 +1526,7 @@ public class ExecEnvTest extends EMFTVMTest { /** * Tests the '{@link org.eclipse.m2m.atl.emftvm.ExecEnv#getRules() <em>Get Rules</em>}' operation. <!-- begin-user-doc --> <!-- * end-user-doc --> - * + * * @see org.eclipse.m2m.atl.emftvm.ExecEnv#getRules() * @generated NOT */ @@ -1576,7 +1543,7 @@ public class ExecEnvTest extends EMFTVMTest { assertTrue(env.getRules().isEmpty()); env.loadModule(new ModuleResolver() { - public Module resolveModule(String name) throws ModuleNotFoundException { + public Module resolveModule(final String name) throws ModuleNotFoundException { return m; } }, "test"); @@ -1598,22 +1565,20 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); final Resource outRes = rs.createResource(URI.createFileURI("out.xmi")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); - + // Get an object, and retrieve its model final EObject object = inRes.getContents().get(0); final Model model = env.getModelOf(object); assertNotNull(model); assertEquals(inModel, model); - + assertNull(env.getModelOf(env)); } @@ -1630,15 +1595,13 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); final Resource outRes = rs.createResource(URI.createFileURI("out.xmi")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); - + final String modelID = env.getModelID(inModel); assertNotNull(modelID); @@ -1658,8 +1621,7 @@ public class ExecEnvTest extends EMFTVMTest { // Load metamodel final Resource portsRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/PortsToPins/Ports.ecore", true), true); - final Metamodel metaModel = EmftvmFactory.eINSTANCE.createMetamodel(); - metaModel.setResource(portsRes); + final Metamodel metaModel = EmftvmFactory.eINSTANCE.createMetamodel(portsRes); env.registerMetaModel("PORTS", metaModel); final String id = env.getMetaModelID(metaModel); @@ -1681,22 +1643,21 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inOutRes = rs.createResource(URI.createFileURI("out.xmi")); - final Model inOutModel = EmftvmFactory.eINSTANCE.createModel(); - inOutModel.setResource(inOutRes); + final Model inOutModel = EmftvmFactory.eINSTANCE.createModel(inOutRes); env.registerInOutModel("INOUT", inOutModel); - + // Create output element final EObject element = inOutModel.newElement(EmftvmPackage.eINSTANCE.getModule()); - + assertFalse(inOutRes.getContents().isEmpty()); assertEquals(element, inOutRes.getContents().get(0)); - + env.queueForDelete(element, new StackFrame(env, EmftvmFactory.eINSTANCE.createCodeBlock())); - + assertFalse(inOutRes.getContents().isEmpty()); - + env.deleteQueue(); - + assertTrue(inOutRes.getContents().isEmpty()); } @@ -1724,22 +1685,20 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); final Resource outRes = rs.createResource(URI.createFileURI("out.xmi")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); - + // Get an object, and retrieve its model final EObject object = inRes.getContents().get(0); final Model model = env.getInputModelOf(object); assertNotNull(model); assertEquals(inModel, model); - + assertNull(env.getInputModelOf(env)); } @@ -1756,22 +1715,20 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInOutModel("IN", inModel); final Resource outRes = rs.createResource(URI.createFileURI("out.xmi")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); - + // Get an object, and retrieve its model final EObject object = inRes.getContents().get(0); final Model model = env.getInoutModelOf(object); assertNotNull(model); assertEquals(inModel, model); - + assertNull(env.getInoutModelOf(env)); } @@ -1788,22 +1745,20 @@ public class ExecEnvTest extends EMFTVMTest { // Load models final Resource inRes = rs.getResource(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/TestQuery.emftvm", true), true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); final Resource outRes = rs.createResource(URI.createFileURI("out.xmi")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); - + // Create output element, and retrieve its model final EObject element = outModel.newElement(EmftvmPackage.eINSTANCE.getModule()); final Model model = env.getOutputModelOf(element); assertNotNull(model); assertEquals(outModel, model); - + assertNull(env.getOutputModelOf(env)); } diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FeatureTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FeatureTest.java index 75228456..510a5989 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FeatureTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FeatureTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FibonacciNativeTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FibonacciNativeTest.java index ecf8ffc2..e284024f 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FibonacciNativeTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FibonacciNativeTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FieldInstructionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FieldInstructionTest.java index 73df8999..90e671bc 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FieldInstructionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FieldInstructionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FieldTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FieldTest.java index 080a53bd..6c3371e2 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FieldTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FieldTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FindtypeSTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FindtypeSTest.java index 95753e98..69e9f264 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FindtypeSTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FindtypeSTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FindtypeTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FindtypeTest.java index b44450c0..f05f0a4f 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FindtypeTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/FindtypeTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetStaticTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetStaticTest.java index 296777ce..dc4ac93d 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetStaticTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetStaticTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetTest.java index ab5618f2..816d2519 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetTransTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetTransTest.java index 5179936e..277a9feb 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetTransTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetTransTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetcbTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetcbTest.java index 086100b2..e826b13f 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetcbTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetcbTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetenvTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetenvTest.java index e626c98a..e2ce9848 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetenvTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetenvTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011-2012 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetenvtypeTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetenvtypeTest.java index 1a49fde9..4f52d5f6 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetenvtypeTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GetenvtypeTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GotoTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GotoTest.java index 6cb7f6ab..e81937d2 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GotoTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/GotoTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfTest.java index 54fad94d..e2eab19b 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfnTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfnTest.java index 586bdc40..ea2a4945 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfnTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfnTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfteTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfteTest.java index 05b5d922..36af559e 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfteTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IfteTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ImpliesTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ImpliesTest.java index 3f427cf1..4543ea52 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ImpliesTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ImpliesTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InputRuleElementTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InputRuleElementTest.java index aea3aac8..2e9ea236 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InputRuleElementTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InputRuleElementTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InsertTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InsertTest.java index 7df06575..4dd8f7f7 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InsertTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InsertTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InstructionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InstructionTest.java index 27cab5b9..bb990eac 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InstructionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InstructionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeAllCbsTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeAllCbsTest.java index d3a2a0ed..a628fd49 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeAllCbsTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeAllCbsTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeCbSTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeCbSTest.java index d184223d..2452639e 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeCbSTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeCbSTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeCbTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeCbTest.java index c3e5ed4b..37d45830 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeCbTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeCbTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeInstructionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeInstructionTest.java index dfc00bf3..30b4468b 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeInstructionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeInstructionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeOperationInstructionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeOperationInstructionTest.java index 501586d8..08a270dc 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeOperationInstructionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeOperationInstructionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeStaticTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeStaticTest.java index 3d358f8a..2e4923ac 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeStaticTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeStaticTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeSuperTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeSuperTest.java index e44788b0..0f900b47 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeSuperTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeSuperTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeTest.java index eaceeeac..eacecdb1 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/InvokeTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IsnullTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IsnullTest.java index d578838a..0a163651 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IsnullTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IsnullTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IterateTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IterateTest.java index b05b4c1b..5c03901e 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IterateTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/IterateTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LineNumberTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LineNumberTest.java index b1f5d92b..6871f55d 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LineNumberTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LineNumberTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LoadTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LoadTest.java index 9334bfc8..9b5ae8bc 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LoadTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LoadTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LocalVariableInstructionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LocalVariableInstructionTest.java index fa7ac4b9..f74c09ea 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LocalVariableInstructionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LocalVariableInstructionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LocalVariableTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LocalVariableTest.java index 207bf677..7da73856 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LocalVariableTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/LocalVariableTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MatchSTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MatchSTest.java index 3f96127c..f4cb3dab 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MatchSTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MatchSTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MatchTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MatchTest.java index cba55414..9d7cab84 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MatchTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MatchTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MetamodelTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MetamodelTest.java index 7040b809..05f17ae3 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MetamodelTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/MetamodelTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModelDeclarationTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModelDeclarationTest.java index 239ceae5..bd526a9f 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModelDeclarationTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModelDeclarationTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModelTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModelTest.java index eddf38c6..76d55023 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModelTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModelTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModuleTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModuleTest.java index db75b142..b39175ab 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModuleTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ModuleTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NamedElementTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NamedElementTest.java index bbb8e8a7..4349399a 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NamedElementTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NamedElementTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NewSTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NewSTest.java index 78d55975..136cb210 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NewSTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NewSTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NewTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NewTest.java index 1b875fa5..8029fa10 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NewTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NewTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NotTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NotTest.java index 0e2efbd1..a1892a31 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NotTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/NotTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OperationTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OperationTest.java index 34de41fa..7b733bdf 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OperationTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OperationTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OrTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OrTest.java index 7a8f7395..8ce5fe15 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OrTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OrTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OutputRuleElementTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OutputRuleElementTest.java index 242759cd..09e2dc2b 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OutputRuleElementTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/OutputRuleElementTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ParameterTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ParameterTest.java index a0fe5118..9e8a8d93 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ParameterTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ParameterTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PopTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PopTest.java index 5577860d..524c3652 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PopTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PopTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushTest.java index eac7f3ac..8db55ac5 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushfTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushfTest.java index 5b72892b..f496e627 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushfTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushfTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushtTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushtTest.java index f4c74ae0..782ca997 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushtTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/PushtTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RemoveTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RemoveTest.java index 0a718889..eac08ec8 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RemoveTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RemoveTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ReturnTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ReturnTest.java index 31f451ce..aecd98b2 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ReturnTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/ReturnTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleElementTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleElementTest.java index ca017b88..43c7bdb9 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleElementTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleElementTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleTest.java index ef9235f8..3a622efd 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SetStaticTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SetStaticTest.java index c31dd61d..70a50bf8 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SetStaticTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SetStaticTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SetTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SetTest.java index 40da11a5..5b5baa1a 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SetTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SetTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/StoreTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/StoreTest.java index 4ea5398c..4f09536c 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/StoreTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/StoreTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SwapTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SwapTest.java index ef8cd49d..a33fe416 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SwapTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SwapTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SwapX1Test.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SwapX1Test.java index 3c0ce73a..a2c50657 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SwapX1Test.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/SwapX1Test.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/TypedElementTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/TypedElementTest.java index b3be469b..10a60840 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/TypedElementTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/TypedElementTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/XorTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/XorTest.java index 04846824..0622f60f 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/XorTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/XorTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/AtlResourceTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/AtlResourceTest.java index 33b6b460..e6f3fb2b 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/AtlResourceTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/AtlResourceTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/CompilerTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/CompilerTest.java index 5fbffe40..e7ba5857 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/CompilerTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/compiler/CompilerTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2013 Dennis Wagelaar. + * Copyright (c) 2013, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -21,12 +21,15 @@ import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.Diagnostician; +import org.eclipse.m2m.atl.common.Problem.ProblemPackage; +import org.eclipse.m2m.atl.common.Problem.Severity; import org.eclipse.m2m.atl.core.emf.EMFReferenceModel; import org.eclipse.m2m.atl.emftvm.CodeBlock; import org.eclipse.m2m.atl.emftvm.EmftvmFactory; @@ -48,7 +51,7 @@ import org.eclipse.m2m.atl.engine.parser.AtlParser; /** * Tests the ATL-to-EMFTVM compiler. - * + * * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class CompilerTest extends EMFTVMTest { @@ -69,10 +72,65 @@ public class CompilerTest extends EMFTVMTest { public void testBindingStat() { final Model outModel = compile(URI.createURI("test-data/BindingStatTest.atl", true)); assertEquals(null, validate(outModel)); + + final Model refModel = loadTestModel(new ResourceSetImpl(), "/test-data/BindingStatTest.emftvm"); + assertEquals(refModel.getResource(), outModel.getResource()); + } + + /** + * Tests the compilation output for "SearchPlanTest.atl". + */ + public void testSearchPlanTest() { + final Model outModel = compile(URI.createURI("test-data/SearchPlanTest.atl", true)); + assertEquals(null, validate(outModel)); + + final Model refModel = loadTestModel(new ResourceSetImpl(), "/test-data/SearchPlanTest.emftvm"); + assertEquals(refModel.getResource(), outModel.getResource()); + } + + /** + * Tests the compilation output for "RecursiveTest.atl". + */ + public void testRecursiveTest() { + final Model outModel = compile(URI.createURI("test-data/RecursiveTest.atl", true)); + assertEquals(null, validate(outModel)); + + final Model refModel = loadTestModel(new ResourceSetImpl(), "/test-data/RecursiveTest.emftvm"); + assertEquals(refModel.getResource(), outModel.getResource()); + } + + /** + * Tests the compilation output for "RecursiveTest2.atl". + */ + public void testRecursiveTest2() { + final EList<EObject> problems = atlwfr(URI.createURI("test-data/RecursiveTest2.atl", true)).getResource() + .getContents(); + assertEquals(1, problems.size()); + assertEquals("Recursive rules are only allowed in refining mode", + problems.get(0).eGet(ProblemPackage.eINSTANCE.getProblem_Description())); + assertEquals("9:1-21:2", + problems.get(0).eGet(ProblemPackage.eINSTANCE.getProblem_Location())); + assertEquals(Severity.ERROR, + problems.get(0).eGet(ProblemPackage.eINSTANCE.getProblem_Severity())); + } + + /** + * Tests the compilation output for "DoubleExtendsTest.atl". + */ + public void testDoubleExtendsTest() { + final EList<EObject> problems = atlwfr(URI.createURI("test-data/DoubleExtendsTest.atl", true)).getResource() + .getContents(); + assertEquals(1, problems.size()); + assertEquals("Cannot combine the '@extends' annotation with the 'extends' keyword", + problems.get(0).eGet(ProblemPackage.eINSTANCE.getProblem_Description())); + assertEquals("18:1-26:2", problems.get(0).eGet(ProblemPackage.eINSTANCE.getProblem_Location())); + assertEquals(Severity.ERROR, problems.get(0).eGet(ProblemPackage.eINSTANCE.getProblem_Severity())); } /** - * Tests regression of <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=405673">Bug # 405673</a>. + * Tests regression of + * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=405673">Bug # + * 405673</a>. */ public void testBug405673() { final Model outModel = compile(URI.createURI("test-data/Regression/Bug405673.atl", true)); @@ -95,8 +153,8 @@ public class CompilerTest extends EMFTVMTest { assertEquals(null, validate(outModel)); final List<EObject> news = outModel.allInstancesOf(EmftvmPackage.eINSTANCE.getNew()); assertFalse(news.isEmpty()); - for (EObject object : news) { - New new_ = (New) object; + for (final EObject object : news) { + final New new_ = (New) object; assertEquals("EXISTING", new_.getModelname()); } } @@ -131,9 +189,9 @@ public class CompilerTest extends EMFTVMTest { final Model refModel = loadTestModel(new ResourceSetImpl(), "/test-data/Regression/Bug425492.emftvm"); assertEquals(refModel.getResource(), outModel.getResource()); } - + /** - * Tests regression of <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=429745">Bug # 429745</a>: + * Tests regression of <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=429745">Bug # 429745</a>: * EMFTVM compiler crashes on reference to target element in rule "from" clause. */ public void testBug429745() { @@ -143,9 +201,19 @@ public class CompilerTest extends EMFTVMTest { } /** + * Tests regression of <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=580448">Bug # 429745</a>: + * EMFTVM compilation of some modules fails with unclear exception. + */ + public void testBug580448() { + final Model outModel = atlwfr(URI.createURI("test-data/Regression/Bug580448.atl", true)); + final Resource pbs = outModel.getResource(); + assertEquals(1, pbs.getContents().size()); + } + + /** * Tests detection of character set encoding by the compiler. - * @throws CoreException - * @throws IOException + * @throws CoreException + * @throws IOException */ public void testCharEncoding() throws CoreException, IOException { final IWorkspaceRoot wr = ResourcesPlugin.getWorkspace().getRoot(); @@ -205,9 +273,8 @@ public class CompilerTest extends EMFTVMTest { /** * Tests the compilation of a compiler module. - * - * @param compilerModule - * the compiler module name + * + * @param compilerModule the compiler module name */ protected void runCompilerModuleTest(final String compilerModule) { final Model outModel = compile(URI @@ -220,7 +287,7 @@ public class CompilerTest extends EMFTVMTest { /** * Compiles the given ATL module. - * + * * @param moduleURI * the module URI * @return the compiled module @@ -234,32 +301,29 @@ public class CompilerTest extends EMFTVMTest { // Load models { final Resource inRes = rs.getResource(moduleURI, true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); } final Resource outRes = rs.createResource(URI.createFileURI("out.emftvm")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); assertEquals(outModel, env.getOutputModels().get("OUT")); final Resource pbsRes = rs.createResource(URI.createFileURI("pbs.xmi")); - final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(); - pbsModel.setResource(pbsRes); + final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(pbsRes); env.registerOutputModel("PBS", pbsModel); assertEquals(pbsModel, env.getOutputModels().get("PBS")); { - final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(); - atlmm.setResource(rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true)); + final Resource atlres = rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true); + final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(atlres); env.registerMetaModel("ATL", atlmm); } { - final Metamodel pbmm = EmftvmFactory.eINSTANCE.createMetamodel(); - pbmm.setResource(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); + final Metamodel pbmm = EmftvmFactory.eINSTANCE + .createMetamodel(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); env.registerMetaModel("Problem", pbmm); } @@ -289,7 +353,7 @@ public class CompilerTest extends EMFTVMTest { } // CodeBlocks passed into a native operation have their parentFrame property set - clear this property: - for (EObject cb : outModel.allInstancesOf(EmftvmPackage.eINSTANCE.getCodeBlock())) { + for (final EObject cb : outModel.allInstancesOf(EmftvmPackage.eINSTANCE.getCodeBlock())) { ((CodeBlock) cb).setParentFrame(null); } @@ -298,25 +362,25 @@ public class CompilerTest extends EMFTVMTest { /** * Validates the bytecode of <code>module</code>. - * + * * @param mmodel * the module model to validate * @return <code>null</code> if <code>module</code> is valid, otherwise the first invalid object */ - protected Object validate(Model mmodel) { - for (EObject eObject : mmodel.allInstancesOf(EmftvmPackage.eINSTANCE.getCodeBlock())) { - CodeBlock cb = (CodeBlock) eObject; + protected Object validate(final Model mmodel) { + for (final EObject eObject : mmodel.allInstancesOf(EmftvmPackage.eINSTANCE.getCodeBlock())) { + final CodeBlock cb = (CodeBlock) eObject; if (!cbStackValidator.validate(cb)) { return cb; } - for (Instruction i : cb.getCode()) { + for (final Instruction i : cb.getCode()) { if (!instrStackValidator.validate(i)) { return i; } } } - for (EObject eObject : mmodel.getResource().getContents()) { - Diagnostic diag = Diagnostician.INSTANCE.validate(eObject); + for (final EObject eObject : mmodel.getResource().getContents()) { + final Diagnostic diag = Diagnostician.INSTANCE.validate(eObject); if (diag.getSeverity() != Diagnostic.OK) { return diag; } @@ -326,7 +390,7 @@ public class CompilerTest extends EMFTVMTest { /** * Checks the given ATL module against the ATL well-formedness rules. - * + * * @param moduleURI * the module URI * @return the problems model @@ -338,26 +402,24 @@ public class CompilerTest extends EMFTVMTest { // Load models { final Resource inRes = rs.getResource(moduleURI, true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); } final Resource pbsRes = rs.createResource(URI.createFileURI("pbs.xmi")); - final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(); - pbsModel.setResource(pbsRes); + final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(pbsRes); env.registerOutputModel("OUT", pbsModel); assertEquals(pbsModel, env.getOutputModels().get("OUT")); { - final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(); - atlmm.setResource(rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true)); + final Resource atlres = rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true); + final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(atlres); env.registerMetaModel("ATL", atlmm); } { - final Metamodel pbmm = EmftvmFactory.eINSTANCE.createMetamodel(); - pbmm.setResource(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); + final Metamodel pbmm = EmftvmFactory.eINSTANCE + .createMetamodel(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); env.registerMetaModel("Problem", pbmm); } diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/fib/Fibonacci.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/fib/Fibonacci.java index ea370050..1c49abaf 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/fib/Fibonacci.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/fib/Fibonacci.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Dennis Wagelaar, Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/integration/IntegrationTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/integration/IntegrationTest.java index bc315690..7d23a352 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/integration/IntegrationTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/integration/IntegrationTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2013 Dennis Wagelaar. + * Copyright (c) 2013, 2021, 2023 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -37,6 +37,7 @@ import org.eclipse.m2m.atl.emftvm.util.DefaultModuleResolver; import org.eclipse.m2m.atl.emftvm.util.LazyList; import org.eclipse.m2m.atl.emftvm.util.TimingData; import org.eclipse.m2m.atl.engine.parser.AtlParser; +import org.eclipse.uml2.uml.UMLPackage; /** * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> @@ -115,6 +116,46 @@ public class IntegrationTest extends EMFTVMTest { } /** + * Tests "SearchPlanTest.atl". + */ + public void testSearchPlanTest() { + final ResourceSet rs = new ResourceSetImpl(); + final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); + final TimingData td = new TimingData(); + final Model in = loadTestModel(rs, "/test-data/SearchPlanTest.ecore"); + final Model out = createTestModel(rs, "/test-data/SearchPlanTest-out.ecore"); + env.registerInputModel("IN", in); + env.registerOutputModel("OUT", out); + env.loadModule(createTestModuleResolver(), "SearchPlanTest"); + td.finishLoading(); + env.run(td); + td.finish(); + + final ResourceSet refRs = new ResourceSetImpl(); + final Model refOut = loadTestModel(refRs, "/test-data/SearchPlanTest-out.ecore"); + assertEquals(refOut.getResource(), out.getResource()); + } + + /** + * Tests "SearchPlanTest.atl". + */ + public void testRecursiveTest() { + final ResourceSet rs = new ResourceSetImpl(); + final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); + final TimingData td = new TimingData(); + final Model in = loadTestModel(rs, "/test-data/RecursiveTest.ecore"); + env.registerInOutModel("IN", in); + env.loadModule(createTestModuleResolver(), "RecursiveTest"); + td.finishLoading(); + env.run(td); + td.finish(); + + final ResourceSet refRs = new ResourceSetImpl(); + final Model refOut = loadTestModel(refRs, "/test-data/RecursiveTest-out.ecore"); + assertEquals(refOut.getResource(), in.getResource()); + } + + /** * Tests regression of * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=408391">Bug # * 408391</a>. @@ -122,8 +163,7 @@ public class IntegrationTest extends EMFTVMTest { public void testBug408391() { final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); final TimingData td = new TimingData(); - final Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(EmftvmPackage.eINSTANCE.eResource()); + final Model model = EmftvmFactory.eINSTANCE.createModel(EmftvmPackage.eINSTANCE.eResource()); env.registerInputModel("IN", model); env.loadModule(createTestModuleResolver(), "Regression::Bug408391"); td.finishLoading(); @@ -166,8 +206,7 @@ public class IntegrationTest extends EMFTVMTest { final ResourceSet rs = new ResourceSetImpl(); final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); final TimingData td = new TimingData(); - final Metamodel metamodel = EmftvmFactory.eINSTANCE.createMetamodel(); - metamodel.setResource(EcorePackage.eINSTANCE.eResource()); + final Metamodel metamodel = EmftvmFactory.eINSTANCE.createMetamodel(EcorePackage.eINSTANCE.eResource()); final Model model = loadTestModel(rs, "/test-data/EcoreCopy/My.ecore"); env.registerMetaModel("E", metamodel); env.registerInOutModel("IN", model); @@ -188,8 +227,7 @@ public class IntegrationTest extends EMFTVMTest { final ResourceSet rs = new ResourceSetImpl(); final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); final TimingData td = new TimingData(); - final Metamodel metamodel = EmftvmFactory.eINSTANCE.createMetamodel(); - metamodel.setResource(EcorePackage.eINSTANCE.eResource()); + final Metamodel metamodel = EmftvmFactory.eINSTANCE.createMetamodel(EcorePackage.eINSTANCE.eResource()); final Model model = loadTestModel(rs, "/test-data/EcoreCopy/My.ecore"); env.registerMetaModel("ECORE", metamodel); env.registerInOutModel("IN", model); @@ -210,8 +248,7 @@ public class IntegrationTest extends EMFTVMTest { final ResourceSet rs = new ResourceSetImpl(); final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); final TimingData td = new TimingData(); - final Metamodel metamodel = EmftvmFactory.eINSTANCE.createMetamodel(); - metamodel.setResource(EcorePackage.eINSTANCE.eResource()); + final Metamodel metamodel = EmftvmFactory.eINSTANCE.createMetamodel(EcorePackage.eINSTANCE.eResource()); final Model model = loadTestModel(rs, "/test-data/EcoreCopy/My.ecore"); env.registerMetaModel("ECORE", metamodel); env.registerInOutModel("IN", model); @@ -338,10 +375,8 @@ public class IntegrationTest extends EMFTVMTest { final ResourceSet rs = new ResourceSetImpl(); final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); final TimingData td = new TimingData(); - final Metamodel tr = EmftvmFactory.eINSTANCE.createMetamodel(); - tr.setResource(TracePackage.eINSTANCE.eResource()); - final Model in = EmftvmFactory.eINSTANCE.createModel(); - in.setResource(EmftvmPackage.eINSTANCE.eResource()); + final Metamodel tr = EmftvmFactory.eINSTANCE.createMetamodel(TracePackage.eINSTANCE.eResource()); + final Model in = EmftvmFactory.eINSTANCE.createModel(EmftvmPackage.eINSTANCE.eResource()); final Model trace = createTestModel(rs, "/test-data/Regression/Bug426154/Bug426154.trace"); final Model out = createTestModel(rs, "/test-data/Regression/Bug426154/Bug426154-out.ecore"); env.registerMetaModel("TR", tr); @@ -431,6 +466,65 @@ public class IntegrationTest extends EMFTVMTest { } /** + * Tests regression of <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=580300">Bug # 580300</a>. + */ + public void testBug580300() { + final ResourceSet rs = new ResourceSetImpl(); + final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); + final TimingData td = new TimingData(); + final Metamodel metamodel = EmftvmFactory.eINSTANCE.createMetamodel(EcorePackage.eINSTANCE.eResource()); + final Model out = createTestModel(rs, "/test-data/Regression/Bug441027-out.xmi"); + env.registerMetaModel("ECORE", metamodel); + env.registerInputModel("IN", metamodel); + env.registerOutputModel("OUT", out); + env.loadModule(createTestModuleResolver(), "Regression::Bug580300"); + td.finishLoading(); + env.run(td); + td.finish(); + + final ResourceSet refRs = new ResourceSetImpl(); + final Model refOut = loadTestModel(refRs, "/test-data/Regression/Bug580300-out.ecore"); + assertEquals(refOut.getResource(), out.getResource()); + } + + /** + * Tests regression of + * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=580300">Bug # + * 580300</a>. + */ + public void testBug581595() { + final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); + final TimingData td = new TimingData(); + env.loadModule(createTestModuleResolver(), "Regression::Bug581595"); + td.finishLoading(); + final Object result = env.run(td); + td.finish(); + + assertEquals(1, result); + } + + /** + * Tests regression of + * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=582322">Bug # + * 582322</a>. + */ + public void testFieldMultipleInheritance() { + final ResourceSet rs = new ResourceSetImpl(); + final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); + final TimingData td = new TimingData(); + final Metamodel metamodel = EmftvmFactory.eINSTANCE.createMetamodel(UMLPackage.eINSTANCE.eResource()); + final Model in = loadTestModel(rs, "/test-data/FieldMultipleInheritance.uml"); + env.registerMetaModel("UML", metamodel); + env.registerInputModel("IN", in); + env.loadModule(createTestModuleResolver(), "FieldMultipleInheritance"); + td.finishLoading(); + final Object result = env.run(td); + td.finish(); + + assertEquals(true, result); + } + + /** * Tests the ATL metamodel API. */ public void testATLAPI() throws Exception { diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/ATLtoEMFTVMPerformanceTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/ATLtoEMFTVMPerformanceTest.java index 298cabc0..40e31d90 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/ATLtoEMFTVMPerformanceTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/ATLtoEMFTVMPerformanceTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2014 Dennis Wagelaar. + * Copyright (c) 2014, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -16,6 +16,7 @@ import java.util.SortedSet; import java.util.TreeSet; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.m2m.atl.core.emf.EMFReferenceModel; @@ -30,7 +31,7 @@ import org.eclipse.m2m.atl.engine.parser.AtlParser; /** * EMFTVM performance test suite for <code>EcoreCopy.atl</code>. - * + * * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class ATLtoEMFTVMPerformanceTest extends PerformanceTest { @@ -39,7 +40,7 @@ public class ATLtoEMFTVMPerformanceTest extends PerformanceTest { /** * Tests EMFTVM performance of <code>ATLtoEMFTVM.atl</code>. - * + * * @throws IOException */ public void testEMFTVM_ATLtoEMFTVM() throws IOException { @@ -48,7 +49,7 @@ public class ATLtoEMFTVMPerformanceTest extends PerformanceTest { /** * Tests EMFTVM performance of <code>ATLtoEMFTVM.atl</code> without JIT. - * + * * @throws IOException */ public void testEMFTVM_NoJIT_ATLtoEMFTVM() throws IOException { @@ -57,14 +58,14 @@ public class ATLtoEMFTVMPerformanceTest extends PerformanceTest { /** * Runs the EMFTVM performance test of <code>ATLtoEMFTVM.atl</code>. - * + * * @throws IOException */ protected void runTestEMFTVM_ATLtoEMFTVM(final String prefix, final boolean jitDisabled) throws IOException { - final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(); - atlmm.setResource(((EMFReferenceModel) AtlParser.getDefault().getAtlMetamodel()).getResource()); - final Metamodel pbmm = EmftvmFactory.eINSTANCE.createMetamodel(); - pbmm.setResource(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); + final Metamodel atlmm = EmftvmFactory.eINSTANCE + .createMetamodel(((EMFReferenceModel) AtlParser.getDefault().getAtlMetamodel()).getResource()); + final Metamodel pbmm = EmftvmFactory.eINSTANCE + .createMetamodel(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); final ExecEnvPool pool = new ExecEnvPool(); pool.setModuleResolverFactory(new DefaultModuleResolverFactory(COMPILER_PLUGIN_URI + "/transformations/")); @@ -75,12 +76,13 @@ public class ATLtoEMFTVMPerformanceTest extends PerformanceTest { // JIT warmup for (int i = 0; i < TEST_COUNT / 10; i++) { final ResourceSet rs = new ResourceSetImpl(); - final Model in = EmftvmFactory.eINSTANCE.createModel(); - in.setResource(rs.getResource(URI.createPlatformPluginURI(COMPILER_PLUGIN_ID + "/transformations/ATLtoEMFTVM.atl", true), true)); - final Model out = EmftvmFactory.eINSTANCE.createModel(); - out.setResource(rs.createResource(URI.createURI("ATLtoEMFTVM.emftvm"))); - final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(); - pbsModel.setResource(rs.createResource(URI.createFileURI("pbs.xmi"))); + final Resource inRes = rs.getResource( + URI.createPlatformPluginURI(COMPILER_PLUGIN_ID + "/transformations/ATLtoEMFTVM.atl", true), true); + final Model in = EmftvmFactory.eINSTANCE.createModel(inRes); + final Resource outRes = rs.createResource(URI.createURI("ATLtoEMFTVM.emftvm")); + final Model out = EmftvmFactory.eINSTANCE.createModel(outRes); + final Resource pbsRes = rs.createResource(URI.createFileURI("pbs.xmi")); + final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(pbsRes); final ExecEnv env = pool.getExecEnv(); env.setJitDisabled(jitDisabled); @@ -97,12 +99,13 @@ public class ATLtoEMFTVMPerformanceTest extends PerformanceTest { for (int i = 0; i < TEST_COUNT; i++) { final TimingData td = new TimingData(); final ResourceSet rs = new ResourceSetImpl(); - final Model in = EmftvmFactory.eINSTANCE.createModel(); - in.setResource(rs.getResource(URI.createPlatformPluginURI(COMPILER_PLUGIN_ID + "/transformations/ATLtoEMFTVM.atl", true), true)); - final Model out = EmftvmFactory.eINSTANCE.createModel(); - out.setResource(rs.createResource(URI.createURI("ATLtoEMFTVM.emftvm"))); - final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(); - pbsModel.setResource(rs.createResource(URI.createFileURI("pbs.xmi"))); + final Resource inRes = rs.getResource( + URI.createPlatformPluginURI(COMPILER_PLUGIN_ID + "/transformations/ATLtoEMFTVM.atl", true), true); + final Model in = EmftvmFactory.eINSTANCE.createModel(inRes); + final Resource outRes = rs.createResource(URI.createURI("ATLtoEMFTVM.emftvm")); + final Model out = EmftvmFactory.eINSTANCE.createModel(outRes); + final Resource pbsRes = rs.createResource(URI.createFileURI("pbs.xmi")); + final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(pbsRes); final ExecEnv env = pool.getExecEnv(); env.setJitDisabled(jitDisabled); diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/EcoreCopyPerformanceTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/EcoreCopyPerformanceTest.java index 69a37de9..61749cdd 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/EcoreCopyPerformanceTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/EcoreCopyPerformanceTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2013-2014 Dennis Wagelaar. + * Copyright (c) 2013, 2014, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -45,16 +45,16 @@ import org.eclipse.m2m.atl.emftvm.util.TimingData; /** * EMFTVM performance test suite for <code>EcoreCopy.atl</code>. - * + * * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class EcoreCopyPerformanceTest extends PerformanceTest { private static final int TEST_COUNT = 500; - + /** * Tests EMFTVM performance of <code>EcoreCopy.atl</code>. - * + * * @throws IOException */ public void testEMFTVM_EcoreCopy() throws IOException { @@ -64,7 +64,7 @@ public class EcoreCopyPerformanceTest extends PerformanceTest { /** * Tests EMFTVM performance of <code>EcoreCopy.atl</code> without JIT. - * + * * @throws IOException */ public void testEMFTVM_NoJIT_EcoreCopy() throws IOException { @@ -75,7 +75,7 @@ public class EcoreCopyPerformanceTest extends PerformanceTest { /** * Runs the EMFTVM performance test of <code>EcoreCopy.atl</code>. - * + * * @throws IOException */ protected void runTestEMFTVM_EcoreCopy(final ExecEnv env, final String prefix) throws IOException { @@ -85,10 +85,11 @@ public class EcoreCopyPerformanceTest extends PerformanceTest { // JIT warmup for (int i = 0; i < TEST_COUNT / 10; i++) { final ResourceSet rs = new ResourceSetImpl(); - final Model in = EmftvmFactory.eINSTANCE.createModel(); - in.setResource(rs.getResource(URI.createPlatformPluginURI(EMFTVM_PLUGIN_ID + "/model/emftvm.ecore", true), true)); - final Model out = EmftvmFactory.eINSTANCE.createModel(); - out.setResource(rs.createResource(URI.createURI("out.ecore"))); + final Resource inRes = rs + .getResource(URI.createPlatformPluginURI(EMFTVM_PLUGIN_ID + "/model/emftvm.ecore", true), true); + final Model in = EmftvmFactory.eINSTANCE.createModel(inRes); + final Resource outRes = rs.createResource(URI.createURI("out.ecore")); + final Model out = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerInputModel("IN", in); env.registerOutputModel("OUT", out); @@ -101,10 +102,11 @@ public class EcoreCopyPerformanceTest extends PerformanceTest { for (int i = 0; i < TEST_COUNT; i++) { final TimingData td = new TimingData(); final ResourceSet rs = new ResourceSetImpl(); - final Model in = EmftvmFactory.eINSTANCE.createModel(); - in.setResource(rs.getResource(URI.createPlatformPluginURI(EMFTVM_PLUGIN_ID + "/model/emftvm.ecore", true), true)); - final Model out = EmftvmFactory.eINSTANCE.createModel(); - out.setResource(rs.createResource(URI.createURI("out.ecore"))); + final Resource inRes = rs + .getResource(URI.createPlatformPluginURI(EMFTVM_PLUGIN_ID + "/model/emftvm.ecore", true), true); + final Model in = EmftvmFactory.eINSTANCE.createModel(inRes); + final Resource outRes = rs.createResource(URI.createURI("out.ecore")); + final Model out = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerInputModel("IN", in); env.registerOutputModel("OUT", out); @@ -125,7 +127,7 @@ public class EcoreCopyPerformanceTest extends PerformanceTest { /** * Tests EMFVM performance of <code>EcoreCopyASM.atl</code>. - * + * * @throws ATLCoreException * @throws IOException */ @@ -135,7 +137,7 @@ public class EcoreCopyPerformanceTest extends PerformanceTest { /** * Tests Regular VM performance of <code>EcoreCopyASM.atl</code>. - * + * * @throws ATLCoreException * @throws IOException */ @@ -145,7 +147,7 @@ public class EcoreCopyPerformanceTest extends PerformanceTest { /** * Tests Regular VM performance of <code>EcoreCopyASM.atl</code>. - * + * * @throws ATLCoreException * @throws IOException */ diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/PerformanceTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/PerformanceTest.java index 5b9f9823..9d88a753 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/PerformanceTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/performance/PerformanceTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013-2014 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoA.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoA.java index 9e2844b6..cfc82d16 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoA.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoA.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoB.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoB.java index b7402d67..6b65b686 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoB.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoB.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoFactory.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoFactory.java index ca163d5d..47ffbff7 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoFactory.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoFactory.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoModelTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoModelTest.java index 33d87cef..f33e3d8c 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoModelTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoModelTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2013 Dennis Wagelaar. + * Copyright (c) 2013, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -37,7 +37,7 @@ import org.eclipse.m2m.atl.emftvm.util.TimingData; /** * Tests the <code>pojo.ecore</code> model using {@link Set} and {@link List} for collections instead of {@link EList}. - * + * * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class PojoModelTest extends EMFTVMTest { @@ -49,21 +49,20 @@ public class PojoModelTest extends EMFTVMTest { /** * {@inheritDoc} - * + * * @throws Exception */ @Override protected void setUp() throws Exception { super.setUp(); - pojo = EmftvmFactory.eINSTANCE.createMetamodel(); - pojo.setResource(PojoPackage.eINSTANCE.eResource()); + pojo = EmftvmFactory.eINSTANCE.createMetamodel(PojoPackage.eINSTANCE.eResource()); moduleResolver = new DefaultModuleResolver(URI.createPlatformPluginURI(PLUGIN_ID + "/test-data/POJOModel/", true).toString(), new ResourceSetImpl()); } /** * Creates a new POJO model. - * + * * @return a new POJO model */ protected Resource createPojoModel() { @@ -82,7 +81,7 @@ public class PojoModelTest extends EMFTVMTest { /** * Creates a new Ecore model. - * + * * @return a new Ecore model */ protected Resource createEcoreModel() { @@ -100,10 +99,8 @@ public class PojoModelTest extends EMFTVMTest { * Test method for <code>POJOToEcore.atl</code>. */ public void testPOJOToEcore() { - final Model in = EmftvmFactory.eINSTANCE.createModel(); - in.setResource(createPojoModel()); - final Model out = EmftvmFactory.eINSTANCE.createModel(); - out.setResource(new ResourceImpl(URI.createURI("out.ecore"))); + final Model in = EmftvmFactory.eINSTANCE.createModel(createPojoModel()); + final Model out = EmftvmFactory.eINSTANCE.createModel(new ResourceImpl(URI.createURI("out.ecore"))); final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); env.registerMetaModel("POJO", pojo); @@ -124,10 +121,8 @@ public class PojoModelTest extends EMFTVMTest { * Test method for <code>EcoreToPOJO.atl</code>. */ public void testEcoreToPOJO() { - final Model in = EmftvmFactory.eINSTANCE.createModel(); - in.setResource(createEcoreModel()); - final Model out = EmftvmFactory.eINSTANCE.createModel(); - out.setResource(new ResourceImpl(URI.createURI("out.pojo"))); + final Model in = EmftvmFactory.eINSTANCE.createModel(createEcoreModel()); + final Model out = EmftvmFactory.eINSTANCE.createModel(new ResourceImpl(URI.createURI("out.pojo"))); final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); env.registerMetaModel("POJO", pojo); @@ -160,8 +155,7 @@ public class PojoModelTest extends EMFTVMTest { * Test method for <code>POJOToPOJO.atl</code>. */ public void testPOJOToPOJO() { - final Model in = EmftvmFactory.eINSTANCE.createModel(); - in.setResource(createPojoModel()); + final Model in = EmftvmFactory.eINSTANCE.createModel(createPojoModel()); final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); env.registerMetaModel("POJO", pojo); diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoPackage.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoPackage.java index 93de3311..bf4a4db2 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoPackage.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/pojo/PojoPackage.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/EMFTVMUtilTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/EMFTVMUtilTest.java index 1aab17b9..5ec62998 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/EMFTVMUtilTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/EMFTVMUtilTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2016-2017 Dennis Wagelaar. + * Copyright (c) 2016, 2017, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -20,6 +20,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.resource.Resource; @@ -29,6 +30,9 @@ import org.eclipse.m2m.atl.emftvm.EmftvmFactory; import org.eclipse.m2m.atl.emftvm.EmftvmPackage; import org.eclipse.m2m.atl.emftvm.ExecEnv; import org.eclipse.m2m.atl.emftvm.Instruction; +import org.eclipse.m2m.atl.emftvm.Metamodel; +import org.eclipse.m2m.atl.emftvm.Model; +import org.eclipse.m2m.atl.emftvm.trace.TracePackage; import org.eclipse.m2m.atl.emftvm.util.EMFTVMUtil; import org.eclipse.m2m.atl.emftvm.util.LazyCollection; import org.eclipse.m2m.atl.emftvm.util.LazyCollections; @@ -342,4 +346,139 @@ public class EMFTVMUtilTest extends TestCase { result); } + /** + * Test method for {@link EMFTVMUtil#findAllInstances(EClass, ExecEnv)}. + */ + public void testfindAllInstances() { + final EmftvmFactory ef = EmftvmFactory.eINSTANCE; + final ExecEnv env = ef.createExecEnv(); + + final Metamodel metamodel = ef.createMetamodel(EcorePackage.eINSTANCE.eResource()); + env.registerMetaModel("ECORE", metamodel); + + final Model inmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerInputModel("IN", inmodel); + + final Model inoutmodel = ef.createModel(TracePackage.eINSTANCE.eResource()); + env.registerInOutModel("INOUT", inoutmodel); + + final Model outmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerOutputModel("OUT", outmodel); + + final EClass eClass = EcorePackage.eINSTANCE.getEClass(); + + final LazyList<EObject> result = EMFTVMUtil.findAllInstances(eClass, env); + + assertEquals(inmodel.allInstancesOf(eClass) + .union(inoutmodel.allInstancesOf(eClass)), result); + } + + /** + * Test method for {@link EMFTVMUtil#findAllInstIn(Object, EClass, ExecEnv)}. + */ + public void testfindAllInstIn_Input() { + final EmftvmFactory ef = EmftvmFactory.eINSTANCE; + final ExecEnv env = ef.createExecEnv(); + + final Metamodel metamodel = ef.createMetamodel(EcorePackage.eINSTANCE.eResource()); + env.registerMetaModel("ECORE", metamodel); + + final Model inmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerInputModel("IN", inmodel); + + final Model inoutmodel = ef.createModel(TracePackage.eINSTANCE.eResource()); + env.registerInOutModel("INOUT", inoutmodel); + + final Model outmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerOutputModel("OUT", outmodel); + + final EClass eClass = EcorePackage.eINSTANCE.getEClass(); + + final LazyList<EObject> result = EMFTVMUtil.findAllInstIn("IN", eClass, env); + + assertEquals(inmodel.allInstancesOf(eClass), result); + } + + /** + * Test method for {@link EMFTVMUtil#findAllInstIn(Object, EClass, ExecEnv)}. + */ + public void testfindAllInstIn_InOut() { + final EmftvmFactory ef = EmftvmFactory.eINSTANCE; + final ExecEnv env = ef.createExecEnv(); + + final Metamodel metamodel = ef.createMetamodel(EcorePackage.eINSTANCE.eResource()); + env.registerMetaModel("ECORE", metamodel); + + final Model inmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerInputModel("IN", inmodel); + + final Model inoutmodel = ef.createModel(TracePackage.eINSTANCE.eResource()); + env.registerInOutModel("INOUT", inoutmodel); + + final Model outmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerOutputModel("OUT", outmodel); + + final EClass eClass = EcorePackage.eINSTANCE.getEClass(); + + final LazyList<EObject> result = EMFTVMUtil.findAllInstIn("INOUT", eClass, env); + + assertEquals(inoutmodel.allInstancesOf(eClass), result); + } + + /** + * Test method for {@link EMFTVMUtil#findAllInstIn(Object, EClass, ExecEnv)}. + */ + public void testfindAllInstIn_Out() { + final EmftvmFactory ef = EmftvmFactory.eINSTANCE; + final ExecEnv env = ef.createExecEnv(); + + final Metamodel metamodel = ef.createMetamodel(EcorePackage.eINSTANCE.eResource()); + env.registerMetaModel("ECORE", metamodel); + + final Model inmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerInputModel("IN", inmodel); + + final Model inoutmodel = ef.createModel(TracePackage.eINSTANCE.eResource()); + env.registerInOutModel("INOUT", inoutmodel); + + final Model outmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerOutputModel("OUT", outmodel); + + final EClass eClass = EcorePackage.eINSTANCE.getEClass(); + + try { + final LazyList<EObject> result = EMFTVMUtil.findAllInstIn("OUT", eClass, env); + + fail("Expected IllegalArgumentExceptionm but got " + result); + } catch (final IllegalArgumentException e) { + // Expected + } + } + + /** + * Test method for {@link EMFTVMUtil#findAllInstIn(Object, EClass, ExecEnv)}. + */ + public void testfindAllInstIn_Meta() { + final EmftvmFactory ef = EmftvmFactory.eINSTANCE; + final ExecEnv env = ef.createExecEnv(); + + final Metamodel metamodel = ef.createMetamodel(EcorePackage.eINSTANCE.eResource()); + env.registerMetaModel("ECORE", metamodel); + + final Model inmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerInputModel("IN", inmodel); + + final Model inoutmodel = ef.createModel(TracePackage.eINSTANCE.eResource()); + env.registerInOutModel("INOUT", inoutmodel); + + final Model outmodel = ef.createModel(EmftvmPackage.eINSTANCE.eResource()); + env.registerOutputModel("OUT", outmodel); + + final EClass eClass = EcorePackage.eINSTANCE.getEClass(); + + final LazyList<EObject> result = EMFTVMUtil.findAllInstIn("ECORE", eClass, env); + + assertEquals(metamodel.allInstancesOf(eClass), result); + } + } diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/ExecEnvPoolTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/ExecEnvPoolTest.java index ce9a8dc1..995594bd 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/ExecEnvPoolTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/ExecEnvPoolTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2013 Dennis Wagelaar. + * Copyright (c) 2013, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.m2m.atl.emftvm.EmftvmFactory; @@ -35,7 +36,7 @@ import org.eclipse.m2m.atl.emftvm.util.TimingData; /** * Tests {@link ExecEnvPool}. - * + * * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class ExecEnvPoolTest extends EMFTVMTest { @@ -57,7 +58,7 @@ public class ExecEnvPoolTest extends EMFTVMTest { try { pool.registerMetaModel("otherMetamodel", metamodel); fail("Expected IllegalStateException"); - } catch (IllegalStateException e) { + } catch (final IllegalStateException e) { // expected } } @@ -77,7 +78,7 @@ public class ExecEnvPoolTest extends EMFTVMTest { try { pool.loadModule("EcoreCopy"); fail("Expected IllegalStateException"); - } catch (IllegalStateException e) { + } catch (final IllegalStateException e) { // expected } } @@ -109,14 +110,14 @@ public class ExecEnvPoolTest extends EMFTVMTest { try { pool.returnExecEnv(EmftvmFactory.eINSTANCE.createExecEnv()); fail("Expected IllegalArgumentException"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { // expected } } /** * Tests the performance of EcoreCopy.emftvm. - * + * * @throws InterruptedException */ public void testEcoreCopyPerformance() throws InterruptedException { @@ -139,10 +140,11 @@ public class ExecEnvPoolTest extends EMFTVMTest { final TimingData td = new TimingData(); final ResourceSet rs = new ResourceSetImpl(); - final Model in = EmftvmFactory.eINSTANCE.createModel(); - in.setResource(rs.getResource(URI.createPlatformPluginURI(EMFTVM_PLUGIN_ID + "/model/emftvm.ecore", true), true)); - final Model out = EmftvmFactory.eINSTANCE.createModel(); - out.setResource(rs.createResource(URI.createURI("out.ecore"))); + final Resource inRes = rs.getResource( + URI.createPlatformPluginURI(EMFTVM_PLUGIN_ID + "/model/emftvm.ecore", true), true); + final Model in = EmftvmFactory.eINSTANCE.createModel(inRes); + final Resource outRes = rs.createResource(URI.createURI("out.ecore")); + final Model out = EmftvmFactory.eINSTANCE.createModel(outRes); assertFalse(env.getInputModels().containsKey("IN")); assertFalse(env.getOutputModels().containsKey("OUT")); diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagNoCacheTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagNoCacheTest.java new file mode 100644 index 00000000..c0c876da --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagNoCacheTest.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2023 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ + +package org.eclipse.m2m.atl.emftvm.util.tests; + +import org.eclipse.m2m.atl.emftvm.util.LazyBag; + +/** + * Tests {@link LazyBag} without initial cache. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class LazyBagNoCacheTest extends LazyBagTest { + + /** + * {@inheritDoc} + */ + @Override + protected LazyBag<String> getTestLazyCollection() { + // Don't reuse lazy collections because their cache takes over when it + // is complete + LazyBag<String> testLazyBag = new LazyBag<String>(); + for (final String string : getDataSource()) { + testLazyBag = testLazyBag.including(string); + } + return testLazyBag; + } + +} diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagOnCollectionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagOnCollectionTest.java index 79623dfa..249ae0f3 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagOnCollectionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagOnCollectionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagTest.java index 59369d3e..6c86a93a 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyCollectionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyCollectionTest.java index 8dc10d19..45bef2bf 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyCollectionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyCollectionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListNoCacheTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListNoCacheTest.java new file mode 100644 index 00000000..a4cf9f81 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListNoCacheTest.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2023 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ + +package org.eclipse.m2m.atl.emftvm.util.tests; + +import org.eclipse.m2m.atl.emftvm.util.LazyList; + +/** + * Tests {@link LazyList} without initial cache. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class LazyListNoCacheTest extends LazyListTest { + + /** + * {@inheritDoc} + */ + @Override + protected LazyList<String> getTestLazyCollection() { + // Don't reuse lazy collections because their cache takes over when it + // is complete + LazyList<String> testLazyList = new LazyList<String>(); + for (final String string : getDataSource()) { + testLazyList = testLazyList.including(string); + } + return testLazyList; + } + +} diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListOnCollectionTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListOnCollectionTest.java index 0da942ef..b596d764 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListOnCollectionTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListOnCollectionTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListOnListTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListOnListTest.java index fc4cae16..ac5b51ac 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListOnListTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListOnListTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListTest.java index b1895cdc..99c1bbe7 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2012 Dennis Wagelaar. + * Copyright (c) 2012, 2023 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -33,7 +33,7 @@ import org.eclipse.m2m.atl.emftvm.util.StackFrame; /** * Tests {@link LazyList}. - * + * * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class LazyListTest extends LazyCollectionTest { @@ -80,7 +80,7 @@ public class LazyListTest extends LazyCollectionTest { try { list.add(0, "Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -93,7 +93,7 @@ public class LazyListTest extends LazyCollectionTest { try { list.addAll(0, getDataSource()); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -106,7 +106,7 @@ public class LazyListTest extends LazyCollectionTest { try { list.move(0, 1); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -119,7 +119,7 @@ public class LazyListTest extends LazyCollectionTest { try { list.move(1, list.first()); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -143,15 +143,15 @@ public class LazyListTest extends LazyCollectionTest { assertEquals(getDataSource().get(0), list.at(1)); assertEquals(getDataSource().get(getDataSource().size() - 1), list.at(getDataSource().size())); try { - String at = list.at(0); + final String at = list.at(0); fail("Expected IndexOutOfBoundsException, but got \"" + at + "\""); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { - String at = list.at(getDataSource().size() + 1); + final String at = list.at(getDataSource().size() + 1); fail("Expected IndexOutOfBoundsException, but got \"" + at + "\""); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -214,9 +214,9 @@ public class LazyListTest extends LazyCollectionTest { assertEquals(getDataSource().get(0), list.first()); try { - String first = new LazyList<String>().first(); + final String first = new LazyList<String>().first(); fail("Expected NoSuchElementException, but got \"" + first + "\""); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } } @@ -248,15 +248,15 @@ public class LazyListTest extends LazyCollectionTest { assertEquals(getDataSource().get(0), list.get(0)); assertEquals(getDataSource().get(getDataSource().size() - 1), list.get(getDataSource().size() - 1)); try { - String at = list.get(-1); + final String at = list.get(-1); fail("Expected IndexOutOfBoundsException, but got \"" + at + "\""); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { - String at = list.get(getDataSource().size()); + final String at = list.get(getDataSource().size()); fail("Expected IndexOutOfBoundsException, but got \"" + at + "\""); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -303,13 +303,13 @@ public class LazyListTest extends LazyCollectionTest { try { final int index = list.indexOf2("NotContained"); fail("Expected IndexOutOfBoundsException, but got " + index); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { final int index = list.indexOf2(null); fail("Expected IndexOutOfBoundsException, but got " + index); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -346,13 +346,13 @@ public class LazyListTest extends LazyCollectionTest { try { list.insertAt(0, "Four"); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { list.insertAt(list.size() + 2, "Four").last(); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -365,9 +365,9 @@ public class LazyListTest extends LazyCollectionTest { assertSame(getDataSource().get(getDataSource().size() - 1), list.last()); try { - String last = new LazyList<String>().last(); + final String last = new LazyList<String>().last(); fail("Expected NoSuchElementException, but got \"" + last + "\""); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } } @@ -395,13 +395,13 @@ public class LazyListTest extends LazyCollectionTest { try { final int index = list.lastIndexOf2("NotContained"); fail("Expected IndexOutOfBoundsException, but got " + index); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { final int index = list.lastIndexOf2(null); fail("Expected IndexOutOfBoundsException, but got " + index); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -422,25 +422,25 @@ public class LazyListTest extends LazyCollectionTest { try { listIt.remove(); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.add("Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.set("Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.next(); fail("Expected NoSuchElementException"); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } assertEquals(list.size(), listIt.nextIndex()); @@ -453,7 +453,7 @@ public class LazyListTest extends LazyCollectionTest { try { listIt.previous(); fail("Expected NoSuchElementException"); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } assertEquals(-1, listIt.previousIndex()); @@ -466,16 +466,16 @@ public class LazyListTest extends LazyCollectionTest { try { getTestLazyCollection().listIterator(-1); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { final LazyList<String> list = getTestLazyCollection(); list.listIterator(list.size() + 1); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } @@ -491,7 +491,7 @@ public class LazyListTest extends LazyCollectionTest { try { listIt.previous(); fail("Expected NoSuchElementException"); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } assertEquals(-1, listIt.previousIndex()); @@ -504,25 +504,25 @@ public class LazyListTest extends LazyCollectionTest { try { listIt.remove(); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.add("Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.set("Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.next(); fail("Expected NoSuchElementException"); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } assertEquals(list.size(), listIt.nextIndex()); @@ -595,7 +595,7 @@ public class LazyListTest extends LazyCollectionTest { try { list.remove(1); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -607,7 +607,7 @@ public class LazyListTest extends LazyCollectionTest { final LazyList<String> list = getTestLazyCollection(); final LazyList<String> reverse = list.reverse(); final ListIterator<String> listIt = list.listIterator(list.size()); - for (String s : reverse) { + for (final String s : reverse) { assertTrue(listIt.hasPrevious()); assertSame(listIt.previous(), s); } @@ -633,7 +633,7 @@ public class LazyListTest extends LazyCollectionTest { }); assertEquals(list.count(list.first()), selected.size()); assertTrue(selected.contains(list.first())); - for (String s : selected) { + for (final String s : selected) { assertEquals(list.first(), s); } @@ -672,7 +672,7 @@ public class LazyListTest extends LazyCollectionTest { try { list.set(0, "Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -689,21 +689,21 @@ public class LazyListTest extends LazyCollectionTest { try { list.subList(-1, list.size()); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { list.subList(list.size(), list.size() - 1); fail("Expected IndexOutOfBoundsException"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { // expected - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { list.subList(0, list.size() + 1).get(list.size()); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -720,19 +720,19 @@ public class LazyListTest extends LazyCollectionTest { try { list.subSequence(0, list.size()); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { list.subSequence(list.size() + 1, list.size() - 1); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { list.subSequence(1, list.size() + 1).at(list.size() + 1); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -745,11 +745,11 @@ public class LazyListTest extends LazyCollectionTest { final LazyList<String> union = list.union(list); assertEquals(list.size() * 2, union.size()); final Iterator<String> unionIt = union.iterator(); - for (String s : list) { + for (final String s : list) { assertTrue(unionIt.hasNext()); assertSame(s, unionIt.next()); } - for (String s : list) { + for (final String s : list) { assertTrue(unionIt.hasNext()); assertSame(s, unionIt.next()); } @@ -778,10 +778,10 @@ public class LazyListTest extends LazyCollectionTest { }); assertEquals(expected, sortedList); - + final List<Object> data = new ArrayList<Object>(); for (int i = 1; i < 100; i++) { - Iterator<EObject> contents = EmftvmPackage.eINSTANCE.eResource().getAllContents(); + final Iterator<EObject> contents = EmftvmPackage.eINSTANCE.eResource().getAllContents(); while (contents.hasNext()) { data.add(contents.next()); } @@ -802,8 +802,8 @@ public class LazyListTest extends LazyCollectionTest { }; final long refStart2 = System.nanoTime(); Collections.sort(expected2, new Comparator<Object>() { - public int compare(Object o1, Object o2) { - return ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1))).compareTo( + public int compare(final Object o1, final Object o2) { + return ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1))).compareTo( ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2)))); } }); @@ -812,7 +812,7 @@ public class LazyListTest extends LazyCollectionTest { sortedList2.last(); // force eval final long lazyEnd2 = System.nanoTime(); assertEquals(expected2, sortedList2); - ATLLogger.info(String.format("Collections.sort() : %d ms, LazyList.sortedBy() : %d ms", (refEnd2 - refStart2) / 1000000L, (lazyEnd2 - refEnd2) / 1000000L)); + ATLLogger.info(String.format("Collections.sort() : %d ms, LazyList.sortedBy() : %d ms", (refEnd2 - refStart2) / 1000000L, (lazyEnd2 - refEnd2) / 1000000L)); } } diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetNoCacheTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetNoCacheTest.java new file mode 100644 index 00000000..5409f01c --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetNoCacheTest.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2023 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ + +package org.eclipse.m2m.atl.emftvm.util.tests; + +import org.eclipse.m2m.atl.emftvm.util.LazyOrderedSet; + +/** + * Tests {@link LazyOrderedSet} without initial cache. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class LazyOrderedSetNoCacheTest extends LazyOrderedSetTest { + + /** + * {@inheritDoc} + */ + @Override + protected LazyOrderedSet<String> getTestLazyCollection() { + // Don't reuse lazy collections because their cache takes over when it + // is complete + LazyOrderedSet<String> testLazyOrderedSet = new LazyOrderedSet<String>(); + for (final String string : getDataSource()) { + testLazyOrderedSet = testLazyOrderedSet.including(string); + } + return testLazyOrderedSet; + } + +} diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetTest.java index 4ea0587e..f963bd1c 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2012 Dennis Wagelaar. + * Copyright (c) 2012, 2023 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -36,7 +36,7 @@ import org.eclipse.m2m.atl.emftvm.util.StackFrame; /** * Tests {@link LazyOrderedSet}. - * + * * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class LazyOrderedSetTest extends LazyCollectionTest { @@ -93,7 +93,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { ordSet.add(0, "Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -106,7 +106,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { ordSet.addAll(0, getDataSource()); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -120,7 +120,9 @@ public class LazyOrderedSetTest extends LazyCollectionTest { assertEquals(ordSet.size() + 1, appended.size()); assertTrue(appended.contains("Four")); assertEquals("Four", appended.get(appended.size() - 1)); + assertEquals("Four", appended.last()); assertEquals(appended, appended.append("Four")); + assertEquals(ordSet.first(), appended.first()); } /** @@ -137,15 +139,15 @@ public class LazyOrderedSetTest extends LazyCollectionTest { assertEquals(first, ordSet.at(1)); assertEquals(last, ordSet.at(getDataSource().size())); try { - String at = ordSet.at(0); + final String at = ordSet.at(0); fail("Expected IndexOutOfBoundsException, but got \"" + at + "\""); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { - String at = ordSet.at(getDataSource().size() + 1); + final String at = ordSet.at(getDataSource().size() + 1); fail("Expected IndexOutOfBoundsException, but got \"" + at + "\""); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -210,9 +212,9 @@ public class LazyOrderedSetTest extends LazyCollectionTest { assertEquals(getDataSource().iterator().next(), list.first()); try { - String first = new LazyOrderedSet<String>().first(); + final String first = new LazyOrderedSet<String>().first(); fail("Expected NoSuchElementException, but got \"" + first + "\""); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } } @@ -251,15 +253,15 @@ public class LazyOrderedSetTest extends LazyCollectionTest { assertEquals(first, ordSet.get(0)); assertEquals(last, ordSet.get(getDataSource().size() - 1)); try { - String at = ordSet.get(-1); + final String at = ordSet.get(-1); fail("Expected IndexOutOfBoundsException, but got \"" + at + "\""); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { - String at = ordSet.get(getDataSource().size()); + final String at = ordSet.get(getDataSource().size()); fail("Expected IndexOutOfBoundsException, but got \"" + at + "\""); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -299,13 +301,13 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { final int index = ordSet.indexOf2("NotContained"); fail("Expected IndexOutOfBoundsException, but got " + index); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { final int index = ordSet.indexOf2(null); fail("Expected IndexOutOfBoundsException, but got " + index); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -346,13 +348,13 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { orderedSet.insertAt(0, "Four"); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { orderedSet.insertAt(orderedSet.size() + 2, "Four").last(); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -405,6 +407,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { /** * Tests {@link LazyCollection#isUnique(org.eclipse.m2m.atl.emftvm.CodeBlock)}. */ + @Override public void testIsUnique() { final LazyCollection<String> list = getTestLazyCollection(); assertFalse(list.isUnique(new NativeCodeBlock() { @@ -412,36 +415,36 @@ public class LazyOrderedSetTest extends LazyCollectionTest { setParentFrame(new StackFrame(EmftvmFactory.eINSTANCE.createExecEnv(), this)); getLocalVariables().add(EmftvmFactory.eINSTANCE.createLocalVariable()); } - + @Override public Object execute(final StackFrame frame) { return null; } - + })); assertTrue(list.isUnique(new NativeCodeBlock() { { setParentFrame(new StackFrame(EmftvmFactory.eINSTANCE.createExecEnv(), this)); getLocalVariables().add(EmftvmFactory.eINSTANCE.createLocalVariable()); } - + @Override public Object execute(final StackFrame frame) { return frame.getLocal(0); } - + })); assertTrue(list.excluding("Three").isUnique(new NativeCodeBlock() { { setParentFrame(new StackFrame(EmftvmFactory.eINSTANCE.createExecEnv(), this)); getLocalVariables().add(EmftvmFactory.eINSTANCE.createLocalVariable()); } - + @Override public Object execute(final StackFrame frame) { return frame.getLocal(0); } - + })); } @@ -458,9 +461,9 @@ public class LazyOrderedSetTest extends LazyCollectionTest { assertSame(lastDs, ordSet.last()); try { - String last = new LazyOrderedSet<String>().last(); + final String last = new LazyOrderedSet<String>().last(); fail("Expected NoSuchElementException, but got \"" + last + "\""); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } } @@ -488,13 +491,13 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { final int index = ordSet.lastIndexOf2("NotContained"); fail("Expected IndexOutOfBoundsException, but got " + index); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { final int index = ordSet.lastIndexOf2(null); fail("Expected IndexOutOfBoundsException, but got " + index); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -515,25 +518,25 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { listIt.remove(); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.add("Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.set("Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.next(); fail("Expected NoSuchElementException"); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } assertEquals(ordSet.size(), listIt.nextIndex()); @@ -546,7 +549,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { listIt.previous(); fail("Expected NoSuchElementException"); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } assertEquals(-1, listIt.previousIndex()); @@ -559,16 +562,16 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { getTestLazyCollection().listIterator(-1); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { final LazyOrderedSet<String> list = getTestLazyCollection(); list.listIterator(list.size() + 1); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } @@ -584,7 +587,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { listIt.previous(); fail("Expected NoSuchElementException"); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } assertEquals(-1, listIt.previousIndex()); @@ -597,25 +600,25 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { listIt.remove(); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.add("Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.set("Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } try { listIt.next(); fail("Expected NoSuchElementException"); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { // expected } assertEquals(ordSet.size(), listIt.nextIndex()); @@ -629,7 +632,9 @@ public class LazyOrderedSetTest extends LazyCollectionTest { final LazyOrderedSet<String> prepended = ordSet.prepend("Four"); assertEquals(ordSet.size() + 1, prepended.size()); assertTrue(prepended.contains("Four")); + assertEquals("Four", prepended.first()); assertEquals("Four", prepended.get(0)); + assertEquals(ordSet.last(), prepended.last()); } /** @@ -688,7 +693,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { ordSet.remove(1); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -700,7 +705,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { final LazyOrderedSet<String> ordSet = getTestLazyCollection(); final LazyOrderedSet<String> reverse = ordSet.reverse(); final ListIterator<String> listIt = ordSet.listIterator(ordSet.size()); - for (String s : reverse) { + for (final String s : reverse) { assertTrue(listIt.hasPrevious()); assertSame(listIt.previous(), s); } @@ -726,7 +731,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { }); assertEquals(1, selected.size()); assertTrue(selected.contains(ordSet.first())); - for (String s : selected) { + for (final String s : selected) { assertEquals(ordSet.first(), s); } @@ -765,7 +770,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { ordSet.set(0, "Four"); fail("Expected UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { // expected } } @@ -782,19 +787,19 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { orderedSet.subList(-1, orderedSet.size()); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { orderedSet.subList(orderedSet.size(), orderedSet.size() - 1); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { orderedSet.subList(0, orderedSet.size() + 1).get(orderedSet.size()); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -811,19 +816,19 @@ public class LazyOrderedSetTest extends LazyCollectionTest { try { orderedSet.subSequence(0, orderedSet.size()); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { orderedSet.subSequence(orderedSet.size() + 1, orderedSet.size() - 1); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } try { orderedSet.subSequence(1, orderedSet.size() + 1).at(orderedSet.size() + 1); fail("Expected IndexOutOfBoundsException"); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { // expected } } @@ -896,7 +901,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { final LazyBag<String> bag = set.asBag(); final LazyBag<String> union = set.union(bag); assertEquals(set.size() + bag.size(), union.size()); - for (String s : set) { + for (final String s : set) { assertEquals(2, union.count(s)); } assertEquals(bag, set.union(new LazyBag<String>())); @@ -923,10 +928,10 @@ public class LazyOrderedSetTest extends LazyCollectionTest { }); assertEquals(expected, sortedSet); - + final List<Object> data = new ArrayList<Object>(); for (int i = 1; i < 100; i++) { - Iterator<EObject> contents = EmftvmPackage.eINSTANCE.eResource().getAllContents(); + final Iterator<EObject> contents = EmftvmPackage.eINSTANCE.eResource().getAllContents(); while (contents.hasNext()) { data.add(contents.next()); } @@ -947,8 +952,8 @@ public class LazyOrderedSetTest extends LazyCollectionTest { }; final long refStart2 = System.nanoTime(); Collections.sort(expected2, new Comparator<Object>() { - public int compare(Object o1, Object o2) { - return ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1))).compareTo( + public int compare(final Object o1, final Object o2) { + return ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1))).compareTo( ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2)))); } }); @@ -957,7 +962,7 @@ public class LazyOrderedSetTest extends LazyCollectionTest { sortedSet2.last(); // force eval final long lazyEnd2 = System.nanoTime(); assertEquals(new LazyOrderedSet<Object>(expected2), sortedSet2); - ATLLogger.info(String.format("Collections.sort() : %d ms, LazyOrderedSet.sortedBy() : %d ms", (refEnd2 - refStart2) / 1000000L, (lazyEnd2 - refEnd2) / 1000000L)); + ATLLogger.info(String.format("Collections.sort() : %d ms, LazyOrderedSet.sortedBy() : %d ms", (refEnd2 - refStart2) / 1000000L, (lazyEnd2 - refEnd2) / 1000000L)); } } diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetNoCacheTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetNoCacheTest.java new file mode 100644 index 00000000..6311f6e1 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetNoCacheTest.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2023 Dennis Wagelaar. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Dennis Wagelaar - initial API and + * implementation and/or initial documentation + *******************************************************************************/ + +package org.eclipse.m2m.atl.emftvm.util.tests; + +import org.eclipse.m2m.atl.emftvm.util.LazySet; + +/** + * Tests {@link LazySet} without initial cache. + * + * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> + */ +public class LazySetNoCacheTest extends LazySetTest { + + /** + * {@inheritDoc} + */ + @Override + protected LazySet<String> getTestLazyCollection() { + // Don't reuse lazy collections because their cache takes over when it + // is complete + LazySet<String> testLazySet = new LazySet<String>(); + for (final String string : getDataSource()) { + testLazySet = testLazySet.including(string); + } + return testLazySet; + } + +} diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetOnSetTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetOnSetTest.java index 41ae5a54..fa4577d3 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetOnSetTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetOnSetTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetTest.java index 46093d07..afc7ed91 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/OCLOperationsTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/OCLOperationsTest.java index 7c73b0ec..82211c3a 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/OCLOperationsTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/OCLOperationsTest.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2013 Dennis Wagelaar. + * Copyright (c) 2013, 2019, 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and @@ -13,25 +13,29 @@ package org.eclipse.m2m.atl.emftvm.util.tests; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import junit.framework.TestCase; - import org.eclipse.m2m.atl.emftvm.EmftvmFactory; import org.eclipse.m2m.atl.emftvm.Feature; import org.eclipse.m2m.atl.emftvm.Operation; import org.eclipse.m2m.atl.emftvm.Parameter; +import org.eclipse.m2m.atl.emftvm.util.LazyBag; import org.eclipse.m2m.atl.emftvm.util.LazyList; +import org.eclipse.m2m.atl.emftvm.util.LazyOrderedSet; +import org.eclipse.m2m.atl.emftvm.util.LazySet; import org.eclipse.m2m.atl.emftvm.util.OCLOperations; import org.eclipse.m2m.atl.emftvm.util.StackFrame; import org.eclipse.m2m.atl.emftvm.util.Tuple; import org.eclipse.m2m.atl.emftvm.util.Types; +import junit.framework.TestCase; + /** * Tests {@link OCLOperations}. - * + * * @author <a href="dwagelaar@gmail.com">Dennis Wagelaar</a> */ public class OCLOperationsTest extends TestCase { @@ -118,7 +122,7 @@ public class OCLOperationsTest extends TestCase { /** * Tests Date::toString(format : String). - * + * * @throws ParseException */ public void testDateToString() throws ParseException { @@ -133,7 +137,7 @@ public class OCLOperationsTest extends TestCase { /** * Tests Date::toString(format : String, locale : String). - * + * * @throws ParseException */ public void testDateToString_Format_Locale() throws ParseException { @@ -205,28 +209,84 @@ public class OCLOperationsTest extends TestCase { } /** + * Tests Bag::-(coll : Collection). + */ + public void testMinus_Bag() { + final Operation minus = findOperation("-", Types.BAG_TYPE, new String[][] { Types.COLLECTION_TYPE }, false); + assertNotNull(minus); + final LazyBag<String> self = new LazyBag<String>(Arrays.asList("one", "two", "two", "three")); + final LazyList<String> coll = new LazyList<String>(Arrays.asList("two")); + final StackFrame frame = new StackFrame(EmftvmFactory.eINSTANCE.createExecEnv(), minus.getBody()); + frame.setLocals(new Object[] { self, coll }); + final LazyBag<?> result = (LazyBag<?>) minus.getBody().execute(frame); + assertEquals(new LazyBag<String>(Arrays.asList("one", "three")), result); + } + + /** + * Tests OrderedSet::-(coll : Collection). + */ + public void testMinus_OrderedSet() { + final Operation minus = findOperation("-", Types.ORDERED_SET_TYPE, new String[][] { Types.COLLECTION_TYPE }, + false); + assertNotNull(minus); + final LazyOrderedSet<String> self = new LazyOrderedSet<String>(Arrays.asList("two", "one", "three")); + final LazyBag<String> coll = new LazyBag<String>(Arrays.asList("one", "one")); + final StackFrame frame = new StackFrame(EmftvmFactory.eINSTANCE.createExecEnv(), minus.getBody()); + frame.setLocals(new Object[] { self, coll }); + final LazyOrderedSet<?> result = (LazyOrderedSet<?>) minus.getBody().execute(frame); + assertEquals(new LazyOrderedSet<String>(Arrays.asList("two", "three")), result); + } + + /** + * Tests Sequence::-(coll : Collection). + */ + public void testMinus_Sequence() { + final Operation minus = findOperation("-", Types.SEQUENCE_TYPE, new String[][] { Types.COLLECTION_TYPE }, + false); + assertNotNull(minus); + final LazyList<String> self = new LazyList<String>(Arrays.asList("two", "two", "one", "one", "three")); + final LazyBag<String> coll = new LazyBag<String>(Arrays.asList("one")); + final StackFrame frame = new StackFrame(EmftvmFactory.eINSTANCE.createExecEnv(), minus.getBody()); + frame.setLocals(new Object[] { self, coll }); + final LazyList<?> result = (LazyList<?>) minus.getBody().execute(frame); + assertEquals(new LazyList<String>(Arrays.asList("two", "two", "three")), result); + } + + /** + * Tests Set::-(coll : Collection). + */ + public void testMinus_Set() { + final Operation minus = findOperation("-", Types.SET_TYPE, new String[][] { Types.COLLECTION_TYPE }, + false); + assertNotNull(minus); + final LazySet<String> self = new LazySet<String>(Arrays.asList("one", "two", "three")); + final LazyBag<String> coll = new LazyBag<String>(Arrays.asList("two", "two")); + final StackFrame frame = new StackFrame(EmftvmFactory.eINSTANCE.createExecEnv(), minus.getBody()); + frame.setLocals(new Object[] { self, coll }); + final LazySet<?> result = (LazySet<?>) minus.getBody().execute(frame); + assertEquals(new LazySet<String>(Arrays.asList("one", "three")), result); + } + + /** * Finds the {@link Operation} with the given details. - * - * @param name - * the operation name - * @param context - * the context model and type - * @param parameters - * the array of parameter models and types - * @param isStatic - * whether the operation is static - * @return the {@link Operation} with the given details or <code>null</code> if not found + * + * @param name the operation name + * @param context the context model and type + * @param parameters the array of parameter models and types + * @param isStatic whether the operation is static + * @return the {@link Operation} with the given details or <code>null</code> if + * not found */ protected Operation findOperation(final String name, final String[] context, final String[][] parameters, final boolean isStatic) { final OCLOperations oclOps = OCLOperations.getInstance(); - for (Feature f : oclOps.getOclModule().getFeatures()) { + for (final Feature f : oclOps.getOclModule().getFeatures()) { if (f instanceof Operation) { - Operation op = (Operation) f; + final Operation op = (Operation) f; if (op.getName().equals(name) && op.isStatic() == isStatic && op.getContextModel().equals(context[0]) && op.getContext().equals(context[1]) && op.getParameters().size() == parameters.length) { boolean parMatch = true; for (int i = 0; i < op.getParameters().size(); i++) { - Parameter p = op.getParameters().get(i); + final Parameter p = op.getParameters().get(i); if (!p.getTypeModel().equals(parameters[i][0]) || !p.getType().equals(parameters[i][1])) { parMatch = false; break; diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/StackFrameTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/StackFrameTest.java index 48e45c84..6080c434 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/StackFrameTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/StackFrameTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2016 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/TupleTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/TupleTest.java index 47a1c094..6fa4cf50 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/TupleTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/TupleTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/.gitignore b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/.gitignore index 9ac01dee..6badfe33 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/.gitignore +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/.gitignore @@ -23,3 +23,5 @@ /DSL2KM3.emftvm /KM32DSL.emftvm /DSLModel2KM2.emftvm +/RecursiveTest2.emftvm +/DoubleExtendsTest.emftvm diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/DoubleExtendsTest.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/DoubleExtendsTest.atl new file mode 100644 index 00000000..dde4aceb --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/DoubleExtendsTest.atl @@ -0,0 +1,26 @@ +-- @atlcompiler emftvm +-- @nsURI ECORE=http://www.eclipse.org/emf/2002/Ecore +module DoubleExtendsTest; + +create OUT : ECORE from IN : ECORE; + +abstract rule NamedElement { + from + s : ECORE!ENamedElement + to + t : ECORE!ENamedElement ( + eAnnotations <- s.eAnnotations, + name <- s.name + ) +} + +-- @extends NamedElement +rule Package extends NamedElement { + from + s : ECORE!EPackage + to + t : ECORE!EPackage ( + nsPrefix <- s.nsPrefix, + nsURI <- s.nsURI + ) +} diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/FieldMultipleInheritance.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/FieldMultipleInheritance.atl new file mode 100644 index 00000000..a6e3b9b7 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/FieldMultipleInheritance.atl @@ -0,0 +1,8 @@ +-- @atlcompiler emftvm +-- @nsURI UML=http://www.eclipse.org/uml2/5.0.0/UML +query FieldMultipleInheritance = + UML!Association.allInstances()->first().testField and + UML!Class.allInstances()->first().testField and + UML!AssociationClass.allInstances()->first().testField; + +helper context UML!Element def : testField : Boolean = true; diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/FieldMultipleInheritance.emftvm b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/FieldMultipleInheritance.emftvm Binary files differnew file mode 100644 index 00000000..56ee2718 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/FieldMultipleInheritance.emftvm diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/FieldMultipleInheritance.uml b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/FieldMultipleInheritance.uml new file mode 100644 index 00000000..127b6cbc --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/FieldMultipleInheritance.uml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Ug67wEEVEe6NV761kibLCw" name="FieldMultipleInheritance"> + <packagedElement xmi:type="uml:Class" xmi:id="_ZPx3kEEVEe6NV761kibLCw" name="TestClass"/> + <packagedElement xmi:type="uml:Association" xmi:id="_efoAkEEVEe6NV761kibLCw" name="TestAssociation"/> + <packagedElement xmi:type="uml:AssociationClass" xmi:id="_g7TY0EEVEe6NV761kibLCw" name="TestAssociationClass"/> +</uml:Model> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest-out.ecore b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest-out.ecore new file mode 100644 index 00000000..f9001a8e --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest-out.ecore @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + name="RecursiveTest" nsURI="RecursiveTest" nsPrefix="RecursiveTest"> + <eSubpackages name="RecursiveTest_nested" nsURI="RecursiveTest_nested" nsPrefix="RecursiveTest_nested"> + <eSubpackages name="RecursiveTest_nested_nested" nsURI="RecursiveTest_nested_nested" + nsPrefix="RecursiveTest_nested_nested"> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + </eSubpackages> + <eSubpackages name="RecursiveTest_nested_nested" nsURI="RecursiveTest_nested_nested" + nsPrefix="RecursiveTest_nested_nested"> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + </eSubpackages> + <eSubpackages name="RecursiveTest_nested_nested" nsURI="RecursiveTest_nested_nested" + nsPrefix="RecursiveTest_nested_nested"> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + </eSubpackages> + </eSubpackages> + <eSubpackages name="RecursiveTest_nested" nsURI="RecursiveTest_nested" nsPrefix="RecursiveTest_nested"> + <eSubpackages name="RecursiveTest_nested_nested" nsURI="RecursiveTest_nested_nested" + nsPrefix="RecursiveTest_nested_nested"> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + </eSubpackages> + <eSubpackages name="RecursiveTest_nested_nested" nsURI="RecursiveTest_nested_nested" + nsPrefix="RecursiveTest_nested_nested"> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + </eSubpackages> + <eSubpackages name="RecursiveTest_nested_nested" nsURI="RecursiveTest_nested_nested" + nsPrefix="RecursiveTest_nested_nested"> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + </eSubpackages> + </eSubpackages> + <eSubpackages name="RecursiveTest_nested" nsURI="RecursiveTest_nested" nsPrefix="RecursiveTest_nested"> + <eSubpackages name="RecursiveTest_nested_nested" nsURI="RecursiveTest_nested_nested" + nsPrefix="RecursiveTest_nested_nested"> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + </eSubpackages> + <eSubpackages name="RecursiveTest_nested_nested" nsURI="RecursiveTest_nested_nested" + nsPrefix="RecursiveTest_nested_nested"> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + </eSubpackages> + <eSubpackages name="RecursiveTest_nested_nested" nsURI="RecursiveTest_nested_nested" + nsPrefix="RecursiveTest_nested_nested"> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + <eSubpackages name="RecursiveTest_nested_nested_nested" nsURI="RecursiveTest_nested_nested_nested" + nsPrefix="RecursiveTest_nested_nested_nested"/> + </eSubpackages> + </eSubpackages> +</ecore:EPackage> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest.atl new file mode 100644 index 00000000..fb2d161b --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest.atl @@ -0,0 +1,21 @@ +-- @atlcompiler emftvm +-- @nsURI ECORE=http://www.eclipse.org/emf/2002/Ecore +module RecursiveTest; + +create OUT : ECORE refining IN : ECORE; + +-- @recursive +-- @distinct +rule AddNestedPackages { + from + s : ECORE!EPackage ( + s.eSubpackages->size() < 3 and + s.name.size() < 30) + to + t : ECORE!EPackage ( + eSubpackages <- s.eSubpackages->append(n)), + n : ECORE!EPackage ( + name <- s.name + '_nested', + nsPrefix <- s.nsPrefix + '_nested', + nsURI <- s.nsURI + '_nested') +}
\ No newline at end of file diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest.ecore b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest.ecore new file mode 100644 index 00000000..de3c860c --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest.ecore @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + name="RecursiveTest" nsURI="RecursiveTest" nsPrefix="RecursiveTest"/> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest.emftvm b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest.emftvm Binary files differnew file mode 100644 index 00000000..e2688ea2 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest.emftvm diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest2.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest2.atl new file mode 100644 index 00000000..3eebd9fd --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/RecursiveTest2.atl @@ -0,0 +1,21 @@ +-- @atlcompiler emftvm +-- @nsURI ECORE=http://www.eclipse.org/emf/2002/Ecore +module RecursiveTest2; + +create OUT : ECORE from IN : ECORE; + +-- @recursive +-- @distinct +rule AddNestedPackages { + from + s : ECORE!EPackage ( + s.eSubpackages->size() < 3 and + s.name.size() < 30) + to + t : ECORE!EPackage ( + eSubpackages <- s.eSubpackages->append(n)), + n : ECORE!EPackage ( + name <- s.name + '_nested', + nsPrefix <- s.nsPrefix + '_nested', + nsURI <- s.nsURI + '_nested') +}
\ No newline at end of file diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/.gitignore b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/.gitignore index 94f26ea6..243c1e0a 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/.gitignore +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/.gitignore @@ -5,3 +5,4 @@ /Bug422408.emftvm /Bug425904.emftvm /Bug429745.emftvm +/Bug580448.emftvm diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug425492.emftvm b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug425492.emftvm Binary files differindex 95daa888..9f481424 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug425492.emftvm +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug425492.emftvm diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300-out.ecore b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300-out.ecore new file mode 100644 index 00000000..8f279f6a --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300-out.ecore @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="ecoreCounter"> + <eClassifiers xsi:type="ecore:EClass" name="1"/> + <eClassifiers xsi:type="ecore:EClass" name="2"/> + <eClassifiers xsi:type="ecore:EClass" name="3"/> + <eClassifiers xsi:type="ecore:EClass" name="4"/> + <eClassifiers xsi:type="ecore:EClass" name="5"/> + <eClassifiers xsi:type="ecore:EClass" name="6"/> + <eClassifiers xsi:type="ecore:EClass" name="7"/> + <eClassifiers xsi:type="ecore:EClass" name="8"/> + <eClassifiers xsi:type="ecore:EClass" name="9"/> + <eClassifiers xsi:type="ecore:EClass" name="10"/> + <eClassifiers xsi:type="ecore:EClass" name="11"/> + <eClassifiers xsi:type="ecore:EClass" name="12"/> + <eClassifiers xsi:type="ecore:EClass" name="13"/> + <eClassifiers xsi:type="ecore:EClass" name="14"/> + <eClassifiers xsi:type="ecore:EClass" name="15"/> + <eClassifiers xsi:type="ecore:EClass" name="16"/> + <eClassifiers xsi:type="ecore:EClass" name="17"/> + <eClassifiers xsi:type="ecore:EClass" name="18"/> + <eClassifiers xsi:type="ecore:EClass" name="19"/> + <eClassifiers xsi:type="ecore:EClass" name="20"/> +</ecore:EPackage> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300.atl new file mode 100644 index 00000000..d27568af --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300.atl @@ -0,0 +1,42 @@ +-- @atlcompiler emftvm +-- @nsURI ECORE=http://www.eclipse.org/emf/2002/Ecore +module "Regression::Bug580300"; + +create OUT : ECORE from IN : ECORE; + +helper def: diff2 : Integer = 0; + +-- This helper increments diff2 value +-- CONTEXT: thisModule +-- RETURN: Integer +helper def: incDiff2() : Integer = + thisModule.refSetValue('diff2', thisModule.diff2+1).refGetValue('diff2'); + +rule EPackage { + from + s : ECORE!EPackage + to + t : ECORE!EPackage ( + name <- s.name + 'Counter', + eClassifiers <- s.eClassifiers->select(c | c.oclIsKindOf(ECORE!EClass)), + eSubpackages <- s.eSubpackages + ) +} + +rule EClass { + from + s : ECORE!EClass + to + t : ECORE!EClass ( + name <- thisModule.incDiff2().toString() + ) +} + +endpoint rule After() { + do { + thisModule.refUnsetValue('diff2'); + thisModule.getEnv().debug('getEnv') + .findStaticField(EMFTVM!ExecEnv, 'diff2').debug('findField') + .getStaticValue().debug('getStaticValue'); + } +} diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300.emftvm b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300.emftvm Binary files differnew file mode 100644 index 00000000..c85ed929 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580300.emftvm diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580448.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580448.atl new file mode 100644 index 00000000..9bd71b02 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug580448.atl @@ -0,0 +1,28 @@ +-- @atlcompiler emftvm +module "Regression::Bug580448"; +create OUT : OUTMM from IN : INMM; + +abstract rule Super { + from + a: INMM!A + using { + var: OUTMM!D = a.getD(); + } + to + b: OUTMM!B +} + +rule Sub extends Super { + from + a: INMM!A( + a.isSpecialCase() + ) + to + b: OUTMM!B( + dataType <- dataType + ), + dataType: OUTMM!"Integer" + do { + b.d <- var; + } +} diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug581595.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug581595.atl new file mode 100644 index 00000000..8ead6842 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug581595.atl @@ -0,0 +1,2 @@ +-- @atlcompiler emftvm +query "Regression::Bug581595" = Sequence{1, 2, 3}->first();
\ No newline at end of file diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug581595.emftvm b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug581595.emftvm Binary files differnew file mode 100644 index 00000000..11733366 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/Regression/Bug581595.emftvm diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest-out.ecore b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest-out.ecore new file mode 100644 index 00000000..e0f8c393 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest-out.ecore @@ -0,0 +1,880 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"> + <ecore:EPackage name="SearchPlanTest_ClassA"> + <eClassifiers xsi:type="ecore:EClass" name="ClassA"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_ClassB"> + <eClassifiers xsi:type="ecore:EClass" name="ClassB"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_ClassA1"> + <eClassifiers xsi:type="ecore:EClass" name="ClassA1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_ClassB1"> + <eClassifiers xsi:type="ecore:EClass" name="ClassB1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_ClassA2"> + <eClassifiers xsi:type="ecore:EClass" name="ClassA2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_ClassB2"> + <eClassifiers xsi:type="ecore:EClass" name="ClassB2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_ClassA3"> + <eClassifiers xsi:type="ecore:EClass" name="ClassA3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_ClassB3"> + <eClassifiers xsi:type="ecore:EClass" name="ClassB3"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_AbstractClassC"> + <eClassifiers xsi:type="ecore:EClass" name="AbstractClassC" abstract="true"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_InterfaceD"> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceD" abstract="true" interface="true"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_AbstractClassC1"> + <eClassifiers xsi:type="ecore:EClass" name="AbstractClassC1" abstract="true"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_InterfaceD1"> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceD1" abstract="true" interface="true"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_AbstractClassC2"> + <eClassifiers xsi:type="ecore:EClass" name="AbstractClassC2" abstract="true"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_InterfaceD2"> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceD2" abstract="true" interface="true"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_AbstractClassC3"> + <eClassifiers xsi:type="ecore:EClass" name="AbstractClassC3" abstract="true"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_InterfaceD3"> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceD3" abstract="true" interface="true"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_DataTypeE"> + <eClassifiers xsi:type="ecore:EDataType" name="DataTypeE" instanceClassName="java.lang.String"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_DataTypeE1"> + <eClassifiers xsi:type="ecore:EDataType" name="DataTypeE1" instanceClassName="java.lang.String"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_DataTypeE2"> + <eClassifiers xsi:type="ecore:EDataType" name="DataTypeE2" instanceClassName="java.lang.String"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_DataTypeE3"> + <eClassifiers xsi:type="ecore:EDataType" name="DataTypeE3" instanceClassName="java.lang.String"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SearchPlanTest_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/Ecore"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SearchPlanTest_http://www.eclipse.org/emf/2002/GenModel_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http:///org/eclipse/emf/ecore/util/ExtendedMetaData_http://www.eclipse.org/emf/2002/GenModel"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SearchPlanTest_http://www.eclipse.org/emf/2002/Ecore_http://www.eclipse.org/emf/2002/GenModel_http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/Ecore1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage1_http://www.eclipse.org/emf/2002/GenModel1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1_http://www.eclipse.org/emf/2002/GenModel1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage1_http://www.eclipse.org/emf/2002/Ecore1_http://www.eclipse.org/emf/2002/GenModel1_http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/Ecore2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage2_http://www.eclipse.org/emf/2002/GenModel2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2_http://www.eclipse.org/emf/2002/GenModel2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage2_http://www.eclipse.org/emf/2002/Ecore2_http://www.eclipse.org/emf/2002/GenModel2_http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/Ecore3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage3_http://www.eclipse.org/emf/2002/GenModel3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3_http://www.eclipse.org/emf/2002/GenModel3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + </ecore:EPackage> + <ecore:EPackage name="NoSearch SubPackage3_http://www.eclipse.org/emf/2002/Ecore3_http://www.eclipse.org/emf/2002/GenModel3_http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + </ecore:EPackage> +</xmi:XMI> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.atl new file mode 100644 index 00000000..f1acefd0 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.atl @@ -0,0 +1,193 @@ +-- @atlcompiler emftvm +-- @nsURI ECORE=http://www.eclipse.org/emf/2002/Ecore +module SearchPlanTest; + +create OUT : ECORE from IN : ECORE; + +rule PackageClass { + from + p : ECORE!EPackage, + c : ECORE!EClass ( + p.eClassifiers->select(e | e.oclIsKindOf(ECORE!EClass) and not e."abstract")->includes(c) + and + c.ePackage = p + and + p = c.ePackage + and + c = c + ) + to + t : ECORE!EPackage ( + name <- p.name + '_' + c.name, + eClassifiers <- Sequence{thisModule.Class(c)} + ) +} + +rule PackageAbstractClass { + from + p : ECORE!EPackage, + ac : ECORE!EClass ( + ac.ePackage = p + and + p = ac.ePackage + and + ac."abstract" + ) + to + t : ECORE!EPackage ( + name <- p.name + '_' + ac.name, + eClassifiers <- Sequence{thisModule.Class(ac)} + ) +} + +rule PackageDataType { + from + p : ECORE!EPackage, + d : ECORE!EDataType ( + d.ePackage = p + and + d.instanceClassName <> '' + ) + to + t : ECORE!EPackage ( + name <- p.name + '_' + d.name, + eClassifiers <- Sequence{thisModule.DataType(d)} + ) +} + +rule PackageAnnotation { + from + p : ECORE!EPackage, + a : ECORE!EAnnotation ( + p.eAnnotations->includes(a) + ) + to + t : ECORE!EPackage ( + name <- p.name + '_' + a.source, + eAnnotations <- Sequence{thisModule.Annotation(a)} + ) +} + +nodefault rule PackageAnnotation3 { + from + p : ECORE!EPackage, + a1 : ECORE!EAnnotation, + a2 : ECORE!EAnnotation, + a3 : ECORE!EAnnotation ( + p.eAnnotations->includes(a1) + and + p.eAnnotations->includes(a2) + and + p.eAnnotations->includes(a3) + ) + to + t : ECORE!EPackage ( + name <- p.name + '_' + a1.source + '_' + a2.source + '_' + a3.source, + eAnnotations <- Sequence{ + thisModule.Annotation(a1), + thisModule.Annotation(a2), + thisModule.Annotation(a3) + } + ) +} + +rule PackageAnnotation3plus { + from + p : ECORE!EPackage, + a1 : ECORE!EAnnotation, + a2 : ECORE!EAnnotation, + a3 : ECORE!EAnnotation ( + p.eAnnotations->includes(a1) + and + p.eAnnotations->includes(a2) + and + p.eAnnotations->includes(a3) + and + a1 <> a2 + and + a2 <> a3 + and + a1 <> a3 + ) + to + t : ECORE!EPackage ( + name <- p.name + '_' + a1.source + '_' + a2.source + '_' + a3.source, + eAnnotations <- Sequence{ + thisModule.Annotation(a1), + thisModule.Annotation(a2), + thisModule.Annotation(a3) + } + ) +} + +nodefault rule PackageAnnotation3plusNoSearch { + from + p : ECORE!EPackage, + a1 : ECORE!EAnnotation, + a2 : ECORE!EAnnotation, + a3 : ECORE!EAnnotation ( + a1 <> a2 + and + p.eAnnotations->includes(a1) + and + a2 <> a3 + and + p.eAnnotations->includes(a2) + and + a1 <> a3 + and + p.eAnnotations->includes(a3) + ) + to + t : ECORE!EPackage ( + name <- 'NoSearch ' + p.name + '_' + a1.source + '_' + a2.source + '_' + a3.source, + eAnnotations <- Sequence{ + thisModule.Annotation(a1), + thisModule.Annotation(a2), + thisModule.Annotation(a3) + } + ) +} + +rule AttributeTypeParameter { + from + a : ECORE!EAttribute, + tp : ECORE!ETypeParameter ( + not a.eAttributeType.oclIsUndefined() and + a.eAttributeType.eTypeParameters->includes(tp) + ) + to + t : ECORE!EPackage ( + name <- 'EAtttribute ' + a.name + '_' + tp.name + ) +} + +unique lazy rule Class { + from + s : ECORE!EClass + to + t : ECORE!EClass ( + "abstract" <- s."abstract", + interface <- s.interface, + name <- s.name + ) +} + +unique lazy rule DataType { + from + s : ECORE!EDataType + to + t : ECORE!EDataType ( + name <- s.name, + instanceClassName <- s.instanceClassName + ) +} + +lazy rule Annotation { + from + s : ECORE!EAnnotation + to + t : ECORE!EAnnotation ( + source <- s.source + ) +} diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.ecore b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.ecore new file mode 100644 index 00000000..97c94a7d --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.ecore @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="SearchPlanTest" nsURI="SearchPlanTest" nsPrefix="SearchPlanTest"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/> + <eClassifiers xsi:type="ecore:EClass" name="ClassA"/> + <eClassifiers xsi:type="ecore:EClass" name="ClassB"/> + <eClassifiers xsi:type="ecore:EClass" name="AbstractClassC" abstract="true"/> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceD" abstract="true" interface="true"/> + <eClassifiers xsi:type="ecore:EDataType" name="DataTypeE" instanceClassName="java.lang.String"/> + <eSubpackages name="SubPackage1" nsURI="SubPackage1" nsPrefix="SubPackage1"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore1"/> + <eClassifiers xsi:type="ecore:EClass" name="ClassA1"/> + <eClassifiers xsi:type="ecore:EClass" name="ClassB1"/> + <eClassifiers xsi:type="ecore:EClass" name="AbstractClassC1" abstract="true"/> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceD1" abstract="true" interface="true"/> + <eClassifiers xsi:type="ecore:EDataType" name="DataTypeE1" instanceClassName="java.lang.String"/> + </eSubpackages> + <eSubpackages name="SubPackage2" nsURI="SubPackage2" nsPrefix="SubPackage2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel2"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore2"/> + <eClassifiers xsi:type="ecore:EClass" name="ClassA2"/> + <eClassifiers xsi:type="ecore:EClass" name="ClassB2"/> + <eClassifiers xsi:type="ecore:EClass" name="AbstractClassC2" abstract="true"/> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceD2" abstract="true" interface="true"/> + <eClassifiers xsi:type="ecore:EDataType" name="DataTypeE2" instanceClassName="java.lang.String"/> + </eSubpackages> + <eSubpackages name="SubPackage3" nsURI="SubPackage2" nsPrefix="SubPackage2"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel3"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore3"/> + <eClassifiers xsi:type="ecore:EClass" name="ClassA3"/> + <eClassifiers xsi:type="ecore:EClass" name="ClassB3"/> + <eClassifiers xsi:type="ecore:EClass" name="AbstractClassC3" abstract="true"/> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceD3" abstract="true" interface="true"/> + <eClassifiers xsi:type="ecore:EDataType" name="DataTypeE3" instanceClassName="java.lang.String"/> + </eSubpackages> +</ecore:EPackage> diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.emftvm b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.emftvm Binary files differnew file mode 100644 index 00000000..4b27962d --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/SearchPlanTest.emftvm diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/transformations/.gitignore b/tests/org.eclipse.m2m.atl.emftvm.tests/transformations/.gitignore index cbb34c7d..190853f0 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.tests/transformations/.gitignore +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/transformations/.gitignore @@ -1 +1,2 @@ /CountFindtypeNew.emftvm +/TestATLSearchPlan.emftvm diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/transformations/TestATLSearchPlan.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/transformations/TestATLSearchPlan.atl new file mode 100644 index 00000000..67feb4b6 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.emftvm.tests/transformations/TestATLSearchPlan.atl @@ -0,0 +1,84 @@ +-- @atlcompiler emftvm +-- @path ATL=/org.eclipse.m2m.atl.common/model/ATL.ecore +query TestATLSearchPlan = ('canBindWith for all OclExpressions:\n\n' + + ATL!OclExpression.allInstances() + ->iterate(exp; acc: String = '' | + let conj : Sequence(ATL!OclExpression) = exp.asConjunction in + let conjStr : String = conj->collect(ce | + Tuple{element=ce, location=ce.location, canBindWith=ce.canBindWith} + ).toString() + in + if acc = '' then + conjStr + else + acc + '\n' + conjStr + endif + ) + + '\n\nbindings for all InPatternElements:\n\n' + + ATL!InPatternElement.allInstances() + ->iterate(ipe; acc: String = '' | + let bindings : Sequence(ATL!OclExpression) = ipe.bindings in + let bindingStr : String = Tuple{element=ipe.qualifiedName, bindings=bindings->collect(binding | + Tuple{b=binding, loc=binding.location, ref=binding.references + ->reject(r | r = binding.canBindWith) + ->collect(r | r.referredVariable.qualifiedName + '@' + r.location) + } + )}.toString() + in + if acc = '' then + bindingStr + else + acc + '\n' + bindingStr + endif + ) + + '\n\nisBinding for all OclExpressions:\n\n' + + ATL!OclExpression.allInstances() + ->iterate(exp; acc: String = '' | + let expStr : String = Tuple{ + element=exp, + location=exp.location, + isBinding=exp.isBinding, + partOfBinding=exp.partOfBinding, + partOfBindingFor=exp.partOfBindingFor.qualifiedName, + containsBinding=exp.containsBinding, + _firstNonBindingExp=exp.firstNonBindingExp + }.toString() + in + if acc = '' then + expStr + else + acc + '\n' + expStr + endif + ) + + '\n\nFirst non-binding filter expression for all MatchedRules with filters:\n\n' + + ATL!MatchedRule.allInstances()->reject(r | r.inPattern.filter.oclIsUndefined()) + ->iterate(r; acc: String = '' | + let rStr : String = Tuple{ + "rule"=r, + location=r.location, + firstNonBindingExp= + let nbe : ATL!OclExpression = r.inPattern.filter.firstNonBindingExp in + if nbe.oclIsUndefined() then + 'OclUndefined' + else + nbe.toString() + '@' + nbe.location + endif + }.toString() + in + if acc = '' then + rStr + else + acc + '\n' + rStr + endif + )).debug(); + +uses ATLSearchPlan; + +helper context OclAny def : qualifiedName : String = + 'OclUndefined'; + +helper context ATL!VariableDeclaration def : qualifiedName : String = + self.varName; + +helper context ATL!InPatternElement def : qualifiedName : String = + self.inPattern."rule".name + '::' + self.varName; diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/META-INF/MANIFEST.MF index 4f97e572..d9245285 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.emftvm.trace.tests;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/pom.xml b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/pom.xml index c1e009b8..db4ac109 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/pom.xml +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -18,12 +18,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.emftvm.trace.tests</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/SourceElementListTest.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/SourceElementListTest.java index 43762a81..90b72b7f 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/SourceElementListTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/SourceElementListTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/SourceElementTest.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/SourceElementTest.java index ec85d3ce..d7b5ac42 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/SourceElementTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/SourceElementTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TargetElementTest.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TargetElementTest.java index af3831bc..c9406147 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TargetElementTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TargetElementTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceAllTests.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceAllTests.java index bfc7b2f8..ba115f74 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceAllTests.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceAllTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceElementTest.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceElementTest.java index 8dacd2d1..73b0b16c 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceElementTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceElementTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceExample.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceExample.java index 6b20b6d3..8f50af62 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceExample.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceExample.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceLinkSetTest.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceLinkSetTest.java index ff497aac..25646ff6 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceLinkSetTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceLinkSetTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceLinkTest.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceLinkTest.java index 3b1f1c79..796d9734 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceLinkTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceLinkTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceTests.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceTests.java index ec789e36..3e6febdf 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceTests.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TraceTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TracedRuleTest.java b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TracedRuleTest.java index 4a2d31d5..9d6af553 100644 --- a/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TracedRuleTest.java +++ b/tests/org.eclipse.m2m.atl.emftvm.trace.tests/src/org/eclipse/m2m/atl/emftvm/trace/tests/TracedRuleTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011 Vrije Universiteit Brussel. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Dennis Wagelaar, Vrije Universiteit Brussel - initial API and diff --git a/tests/org.eclipse.m2m.atl.tests-feature/build.properties b/tests/org.eclipse.m2m.atl.tests-feature/build.properties index 2077c086..f3aa0ff8 100644 --- a/tests/org.eclipse.m2m.atl.tests-feature/build.properties +++ b/tests/org.eclipse.m2m.atl.tests-feature/build.properties @@ -1,11 +1,11 @@ # NLS_MESSAGEFORMAT_VAR bin.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ license.html src.includes = modeling32.png,\ - epl-v10.html,\ + epl-v20.html,\ feature.properties,\ feature.xml,\ license.html diff --git a/tests/org.eclipse.m2m.atl.tests-feature/copyright.txt b/tests/org.eclipse.m2m.atl.tests-feature/copyright.txt index a6a0f3f3..25921105 100644 --- a/tests/org.eclipse.m2m.atl.tests-feature/copyright.txt +++ b/tests/org.eclipse.m2m.atl.tests-feature/copyright.txt @@ -1,8 +1,8 @@ Copyright (c) 2008, 2012 Obeo. All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial API and implementation
\ No newline at end of file diff --git a/tests/org.eclipse.m2m.atl.tests-feature/epl-v10.html b/tests/org.eclipse.m2m.atl.tests-feature/epl-v10.html deleted file mode 100644 index f957f3e7..00000000 --- a/tests/org.eclipse.m2m.atl.tests-feature/epl-v10.html +++ /dev/null @@ -1,259 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- saved from url=(0041)http://www.eclipse.org/legal/epl-v10.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -<style type="text/css"></style></head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to 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.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - - - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.m2m.atl.tests-feature/epl-v20.html b/tests/org.eclipse.m2m.atl.tests-feature/epl-v20.html new file mode 100644 index 00000000..99a83880 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.tests-feature/epl-v20.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html --> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>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. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution†means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + 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 changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor†means any person or entity that Distributes the Program.</p> + <p>“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. + </p> + <p>“Program†means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient†means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works†shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works†shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute†means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code†means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License†means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, 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 or other 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. + </li> + <li>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. + </li> + <li>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. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other 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; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>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. + </p> + <p>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. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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. + </p> + <h2 id="general">7. GENERAL</h2> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. + </p> + <p>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. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.†+ </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + +<div id="eid-chrome-extension-is-installed"></div></body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.m2m.atl.tests-feature/feature.properties b/tests/org.eclipse.m2m.atl.tests-feature/feature.properties index 875c2049..398093ab 100644 --- a/tests/org.eclipse.m2m.atl.tests-feature/feature.properties +++ b/tests/org.eclipse.m2m.atl.tests-feature/feature.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2007 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 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * IBM - Initial API and implementation @@ -36,9 +36,9 @@ description = Automated non-regression tests for ATL. copyrightURL=copyright.txt copyright=Copyright (c) 2008, 2012 Obeo.\n\ All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License v2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ +https://www.eclipse.org/legal/epl-2.0/\n\ \n\ Contributors:\n\ Obeo - initial API and implementation @@ -54,128 +54,143 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 9, 2014\n\ +\n\ +November 22, 2017\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\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS 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 OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +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\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + 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 TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +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\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + 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\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## - - - diff --git a/tests/org.eclipse.m2m.atl.tests-feature/feature.xml b/tests/org.eclipse.m2m.atl.tests-feature/feature.xml index f0793061..b8bb0565 100644 --- a/tests/org.eclipse.m2m.atl.tests-feature/feature.xml +++ b/tests/org.eclipse.m2m.atl.tests-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.m2m.atl.tests" label="%featureName" - version="4.1.0.qualifier" + version="4.10.0.qualifier" provider-name="%providerName"> <description> @@ -22,21 +22,6 @@ <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> </url> - <requires> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.emf.compare.match"/> - <import plugin="org.eclipse.emf.compare.diff"/> - <import plugin="org.junit"/> - <import plugin="org.eclipse.m2m.atl.engine"/> - <import plugin="org.eclipse.m2m.atl.drivers.emf4atl"/> - <import plugin="org.eclipse.m2m.atl"/> - <import plugin="org.eclipse.m2m.atl.engine.emfvm"/> - <import plugin="org.eclipse.m2m.atl.core"/> - <import plugin="org.eclipse.m2m.atl.core.emf"/> - <import plugin="org.eclipse.m2m.atl.core.ui.vm"/> - </requires> - <plugin id="org.eclipse.m2m.atl.tests" download-size="0" diff --git a/tests/org.eclipse.m2m.atl.tests-feature/license.html b/tests/org.eclipse.m2m.atl.tests-feature/license.html index cecf137d..afb2f35c 100644 --- a/tests/org.eclipse.m2m.atl.tests-feature/license.html +++ b/tests/org.eclipse.m2m.atl.tests-feature/license.html @@ -1,106 +1,190 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html --> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<?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> -<style type="text/css"></style></head> +</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>
\ No newline at end of file + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</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 2.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-2.0">http://www.eclipse.org/legal/epl-2.0</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 Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <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/tests/org.eclipse.m2m.atl.tests-feature/pom.xml b/tests/org.eclipse.m2m.atl.tests-feature/pom.xml index 07f8a114..ce21c36e 100644 --- a/tests/org.eclipse.m2m.atl.tests-feature/pom.xml +++ b/tests/org.eclipse.m2m.atl.tests-feature/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl.features</groupId> <artifactId>org.eclipse.m2m.atl.tests</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/tests/org.eclipse.m2m.atl.tests.standalone/META-INF/MANIFEST.MF b/tests/org.eclipse.m2m.atl.tests.standalone/META-INF/MANIFEST.MF index 4c5fd197..350d2e0d 100644 --- a/tests/org.eclipse.m2m.atl.tests.standalone/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.m2m.atl.tests.standalone/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.tests.standalone -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.m2m.atl.tests.standalone diff --git a/tests/org.eclipse.m2m.atl.tests.standalone/about.html b/tests/org.eclipse.m2m.atl.tests.standalone/about.html index c258ef55..044c0c86 100644 --- a/tests/org.eclipse.m2m.atl.tests.standalone/about.html +++ b/tests/org.eclipse.m2m.atl.tests.standalone/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 5, 2006</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/tests/org.eclipse.m2m.atl.tests.standalone/about.properties b/tests/org.eclipse.m2m.atl.tests.standalone/about.properties index 512bebaa..b401f84d 100644 --- a/tests/org.eclipse.m2m.atl.tests.standalone/about.properties +++ b/tests/org.eclipse.m2m.atl.tests.standalone/about.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002-2005 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 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * IBM - Initial API and implementation diff --git a/tests/org.eclipse.m2m.atl.tests.standalone/plugin.properties b/tests/org.eclipse.m2m.atl.tests.standalone/plugin.properties index 74c27227..5693dbd3 100644 --- a/tests/org.eclipse.m2m.atl.tests.standalone/plugin.properties +++ b/tests/org.eclipse.m2m.atl.tests.standalone/plugin.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2007, 2011 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestEMFVMStandalone.java b/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestEMFVMStandalone.java index a02d96d9..14da1625 100644 --- a/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestEMFVMStandalone.java +++ b/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestEMFVMStandalone.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2011 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestEMFVMStandalone.properties b/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestEMFVMStandalone.properties index 2c12025d..8f252172 100644 --- a/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestEMFVMStandalone.properties +++ b/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestEMFVMStandalone.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2007, 2011 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestVMStandalone.java b/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestVMStandalone.java index ed5909c0..0096da17 100644 --- a/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestVMStandalone.java +++ b/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestVMStandalone.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2011 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestVMStandalone.properties b/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestVMStandalone.properties index 2c12025d..8f252172 100644 --- a/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestVMStandalone.properties +++ b/tests/org.eclipse.m2m.atl.tests.standalone/src/org/eclipse/m2m/atl/tests/standalone/TestVMStandalone.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2007, 2011 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.m2m.atl.tests/META-INF/MANIFEST.MF index 650c4765..7d9e7b7a 100644 --- a/tests/org.eclipse.m2m.atl.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.m2m.atl.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.m2m.atl.tests;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.m2m.atl.tests, diff --git a/tests/org.eclipse.m2m.atl.tests/about.html b/tests/org.eclipse.m2m.atl.tests/about.html index c258ef55..044c0c86 100644 --- a/tests/org.eclipse.m2m.atl.tests/about.html +++ b/tests/org.eclipse.m2m.atl.tests/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 5, 2006</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/tests/org.eclipse.m2m.atl.tests/about.properties b/tests/org.eclipse.m2m.atl.tests/about.properties index 512bebaa..b401f84d 100644 --- a/tests/org.eclipse.m2m.atl.tests/about.properties +++ b/tests/org.eclipse.m2m.atl.tests/about.properties @@ -3,9 +3,9 @@ # * # * Copyright (c) 2002-2005 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 +# * are made available under the terms of the Eclipse Public License v2.0 # * which accompanies this distribution, and is available at -# * http://www.eclipse.org/legal/epl-v10.html +# * https://www.eclipse.org/legal/epl-2.0/ # * # * Contributors: # * IBM - Initial API and implementation diff --git a/tests/org.eclipse.m2m.atl.tests/plugin.properties b/tests/org.eclipse.m2m.atl.tests/plugin.properties index 42c4ddb8..fd393c38 100644 --- a/tests/org.eclipse.m2m.atl.tests/plugin.properties +++ b/tests/org.eclipse.m2m.atl.tests/plugin.properties @@ -1,9 +1,9 @@ ################################################################################ # Copyright (c) 2007, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/pom.xml b/tests/org.eclipse.m2m.atl.tests/pom.xml index 0247feff..69ae7865 100644 --- a/tests/org.eclipse.m2m.atl.tests/pom.xml +++ b/tests/org.eclipse.m2m.atl.tests/pom.xml @@ -2,9 +2,9 @@ <!-- Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 + are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Contributors: Obeo - initial creator @@ -17,12 +17,12 @@ <parent> <artifactId>m2m.atl-parent</artifactId> <groupId>org.eclipse.m2m.atl</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.m2m.atl.releng.parent</relativePath> </parent> <groupId>org.eclipse.m2m.atl</groupId> <artifactId>org.eclipse.m2m.atl.tests</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/AtlTestPlugin.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/AtlTestPlugin.java index c10db495..0935dc59 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/AtlTestPlugin.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/AtlTestPlugin.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/suite/AllTests.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/suite/AllTests.java index 974a05d8..a2ebd8d0 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/suite/AllTests.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/suite/AllTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegression.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegression.java index e1b15685..9b8cda3e 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegression.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegression.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionCompiler.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionCompiler.java index 8ab5b120..dcecc3e0 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionCompiler.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionCompiler.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionFormatter.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionFormatter.java index c13a7ab5..827f1f34 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionFormatter.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionFormatter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionFormatter.properties b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionFormatter.properties index 642b6ea8..35c21830 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionFormatter.properties +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionFormatter.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2007, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionParser.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionParser.java index 22519cfc..36acc91b 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionParser.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionParser.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionParser.properties b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionParser.properties index b95c1b7f..71f6679b 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionParser.properties +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionParser.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2007, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionTransfo.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionTransfo.java index af68b6a8..d7c6d676 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionTransfo.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/TestNonRegressionTransfo.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFTVM.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFTVM.java index e32ffb6f..6c9f5cf7 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFTVM.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFTVM.java @@ -1,10 +1,11 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. + * Copyright (c) 2021 Dennis Wagelaar. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * Obeo - ATL tester * Dennis Wagelaar @@ -57,10 +58,11 @@ import org.eclipse.uml2.uml.resource.UMLResource; /** * Specifies TestNonRegressionTransfo for the EMFTVM. - * + * * @author <a href="mailto:william.piers@obeo.fr">William Piers</a> * @author <a href="mailto:dwagelaar@gmail.com">Dennis Wagelaar</a> */ +@SuppressWarnings("restriction") public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { public static final String COMPILER_PLUGIN_ID = "org.eclipse.m2m.atl.emftvm.compiler"; @@ -68,7 +70,7 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { class CompilingModuleResolver implements ModuleResolver { - public Module resolveModule(String name) throws ModuleNotFoundException { + public Module resolveModule(final String name) throws ModuleNotFoundException { final URI uri = URI.createURI(name, true); final Model model = compile(uri); return (Module) model.getResource().getContents().get(0); @@ -76,10 +78,8 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { } - protected final Metamodel pbmm = EmftvmFactory.eINSTANCE.createMetamodel(); - { - pbmm.setResource(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); - } + protected final Metamodel pbmm = EmftvmFactory.eINSTANCE + .createMetamodel(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); /** * {@inheritDoc} @@ -93,16 +93,16 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { /** * {@inheritDoc} - * + * * @see org.eclipse.m2m.atl.tests.unit.TestNonRegressionTransfo#setUp() */ @Override protected void setUp() throws Exception { super.setUp(); - Properties properties = new Properties(); + final Properties properties = new Properties(); properties.load(TestNonRegressionEMFTVM.class.getResourceAsStream("TestNonRegressionEMFTVM.properties")); //$NON-NLS-1$ setProperties(properties); - + Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, new UMLResourceFactoryImpl()); EPackage.Registry.INSTANCE.put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE); @@ -110,29 +110,30 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { EPackage.Registry.INSTANCE.put("http://www.eclipse.org/uml2/2.0.0/UML", UMLPackage.eINSTANCE); //$NON-NLS-1$ EPackage.Registry.INSTANCE.put("http://www.eclipse.org/uml2/2.1.0/UML", UMLPackage.eINSTANCE); //$NON-NLS-1$ } - + /** * Launch a transformation. - * + * * @return pureExecutionTime, i.e. the execution time without loading/saving models */ + @Override protected double launch() throws ATLCoreException, IOException { final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv(); final ModuleResolver mr = new CompilingModuleResolver(); final ResourceSet rs = new ResourceSetImpl(); // Launch configuration analysis - URL asmURL = launchParser.getAsmUrl(); - Map<String, String> unsortedSourceModels = launchParser.getInput(); - Map<String, String> unsortedTargetModels = launchParser.getOutput(); - Map<String, String> modelPaths = launchParser.getPath(); - Map<String, URL> libs = launchParser.getLibsFromConfig(); - List<URL> superimps = launchParser.getSuperimpose(); - Map<String, Object> options = launchParser.getOptions(); + final URL asmURL = launchParser.getAsmUrl(); + final Map<String, String> unsortedSourceModels = launchParser.getInput(); + final Map<String, String> unsortedTargetModels = launchParser.getOutput(); + final Map<String, String> modelPaths = launchParser.getPath(); + final Map<String, URL> libs = launchParser.getLibsFromConfig(); + final List<URL> superimps = launchParser.getSuperimpose(); + final Map<String, Object> options = launchParser.getOptions(); // WARNING only atl2006 compiler refining mode is supported boolean isRefiningTraceMode = false; - Object refiningOption = options.get(ATLLaunchConstants.IS_REFINING); + final Object refiningOption = options.get(ATLLaunchConstants.IS_REFINING); if (refiningOption != null) { isRefiningTraceMode = new Boolean(refiningOption.toString()); } @@ -141,64 +142,64 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { fail("Refining trace mode not supported on EMFTVM"); } - Map<String, String> modelHandlers = launchParser.getModelHandler(); + final Map<String, String> modelHandlers = launchParser.getModelHandler(); options.put("modelHandlers", modelHandlers); //$NON-NLS-1$ // Metamodels final Set<String> metamodels = new LinkedHashSet<String>(); metamodels.addAll(unsortedSourceModels.values()); metamodels.addAll(unsortedTargetModels.values()); - for (String metamodel : metamodels) { + for (final String metamodel : metamodels) { loadMetaModel(env, rs, metamodel, modelPaths.get(metamodel)); } EMFTVMUtil.registerEPackages(rs); // Libraries - for (Entry<String, URL> entry : libs.entrySet()) { + for (final Entry<String, URL> entry : libs.entrySet()) { env.loadModule(mr, moduleName(entry.getValue())); } env.loadModule(mr, moduleName(asmURL)); // API extensions management - for (URL url : superimps) { + for (final URL url : superimps) { env.loadModule(mr, moduleName(url)); } - long startTime = System.currentTimeMillis(); + final long startTime = System.currentTimeMillis(); // Input models - for (String key : unsortedSourceModels.keySet()) { + for (final String key : unsortedSourceModels.keySet()) { loadModel(env, rs, key, modelPaths.get(key), false); } // Output models - for (String key : unsortedTargetModels.keySet()) { + for (final String key : unsortedTargetModels.keySet()) { createModel(env, rs, key, modelPaths.get(key), false); } try { env.run(null); - } catch (VMException e) { + } catch (final VMException e) { fail(asmURL.toString(), e); } // Output models final Map<String, String> saveOptions = new HashMap<String, String>(); saveOptions.put(XMLResource.OPTION_ENCODING, "ISO-8859-1"); - for (Model outModel : env.getOutputModels().values()) { + for (final Model outModel : env.getOutputModels().values()) { outModel.getResource().save(saveOptions); } - long endTime = System.currentTimeMillis(); + final long endTime = System.currentTimeMillis(); return (endTime - startTime) / 1000.; } - private static void loadModel(final ExecEnv env, final ResourceSet rs, final String name, final String path, boolean inOut) { - Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(rs.getResource(uri(path), true)); + private static void loadModel(final ExecEnv env, final ResourceSet rs, final String name, final String path, final boolean inOut) { + final Resource resource = rs.getResource(uri(path), true); + final Model model = EmftvmFactory.eINSTANCE.createModel(resource); if (inOut) { env.registerInOutModel(name, model); } else { @@ -207,18 +208,18 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { } private static void loadMetaModel(final ExecEnv env, final ResourceSet rs, final String name, final String path) { - Metamodel model = EmftvmFactory.eINSTANCE.createMetamodel(); + final Metamodel model; if ("#EMF".equals(path)) { - model.setResource(EcorePackage.eINSTANCE.eResource()); + model = EmftvmFactory.eINSTANCE.createMetamodel(EcorePackage.eINSTANCE.eResource()); } else { - model.setResource(rs.getResource(uri(path), true)); + model = EmftvmFactory.eINSTANCE.createMetamodel(rs.getResource(uri(path), true)); } env.registerMetaModel(name, model); } - private static void createModel(final ExecEnv env, final ResourceSet rs, final String name, final String path, boolean inOut) { - Model model = EmftvmFactory.eINSTANCE.createModel(); - model.setResource(rs.createResource(uri(path))); + private static void createModel(final ExecEnv env, final ResourceSet rs, final String name, final String path, final boolean inOut) { + final Resource resource = rs.createResource(uri(path)); + final Model model = EmftvmFactory.eINSTANCE.createModel(resource); if (inOut) { env.registerInOutModel(name, model); } else { @@ -238,7 +239,7 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { /** * Compiles the given ATL module. - * + * * @param moduleURI * the module URI * @return the compiled module @@ -253,32 +254,29 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { // Load models { final Resource inRes = rs.getResource(moduleURI, true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); } final Resource outRes = rs.createResource(URI.createFileURI("out.emftvm")); - final Model outModel = EmftvmFactory.eINSTANCE.createModel(); - outModel.setResource(outRes); + final Model outModel = EmftvmFactory.eINSTANCE.createModel(outRes); env.registerOutputModel("OUT", outModel); assertEquals(outModel, env.getOutputModels().get("OUT")); final Resource pbsRes = rs.createResource(URI.createFileURI("pbs.xmi")); - final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(); - pbsModel.setResource(pbsRes); + final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(pbsRes); env.registerOutputModel("PBS", pbsModel); assertEquals(pbsModel, env.getOutputModels().get("PBS")); { - final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(); - atlmm.setResource(rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true)); + final Resource atlres = rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true); + final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(atlres); env.registerMetaModel("ATL", atlmm); } { - final Metamodel pbmm = EmftvmFactory.eINSTANCE.createMetamodel(); - pbmm.setResource(((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource()); + final Resource pbres = ((EMFReferenceModel) AtlParser.getDefault().getProblemMetamodel()).getResource(); + final Metamodel pbmm = EmftvmFactory.eINSTANCE.createMetamodel(pbres); env.registerMetaModel("Problem", pbmm); } @@ -307,7 +305,7 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { } // CodeBlocks passed into a native operation have their parentFrame property set - clear this property: - for (EObject cb : outModel.allInstancesOf(EmftvmPackage.eINSTANCE.getCodeBlock())) { + for (final EObject cb : outModel.allInstancesOf(EmftvmPackage.eINSTANCE.getCodeBlock())) { ((CodeBlock) cb).setParentFrame(null); } @@ -316,7 +314,7 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { /** * Checks the given ATL module against the ATL well-formedness rules. - * + * * @param moduleURI * the module URI * @return the problems model @@ -328,20 +326,18 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { // Load models { final Resource inRes = rs.getResource(moduleURI, true); - final Model inModel = EmftvmFactory.eINSTANCE.createModel(); - inModel.setResource(inRes); + final Model inModel = EmftvmFactory.eINSTANCE.createModel(inRes); env.registerInputModel("IN", inModel); } final Resource pbsRes = rs.createResource(URI.createFileURI("pbs.xmi")); - final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(); - pbsModel.setResource(pbsRes); + final Model pbsModel = EmftvmFactory.eINSTANCE.createModel(pbsRes); env.registerOutputModel("OUT", pbsModel); assertEquals(pbsModel, env.getOutputModels().get("OUT")); { - final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(); - atlmm.setResource(rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true)); + final Resource atlres = rs.getResource(URI.createURI("http://www.eclipse.org/gmt/2005/ATL"), true); + final Metamodel atlmm = EmftvmFactory.eINSTANCE.createMetamodel(atlres); env.registerMetaModel("ATL", atlmm); } @@ -363,20 +359,20 @@ public class TestNonRegressionEMFTVM extends TestNonRegressionTransfo { /** * Retrieves problem elements from <code>problems</code>. - * + * * @param problems * the problems model * @param pbElements * the collection of problem elements to augment * @return the number of error problems */ - protected int getProblems(Model problems, Collection<EObject> pbElements) { - final Collection<EObject> pbs = (Collection<EObject>) problems.allInstancesOf((EClass) pbmm.findType("Problem")); //$NON-NLS-1$ + protected int getProblems(final Model problems, final Collection<EObject> pbElements) { + final Collection<EObject> pbs = problems.allInstancesOf((EClass) pbmm.findType("Problem")); //$NON-NLS-1$ int nbErrors = 0; if (pbs != null) { - for (EObject pb : pbs) { - EStructuralFeature severityFeature = pb.eClass().getEStructuralFeature("severity"); //$NON-NLS-1$ + for (final EObject pb : pbs) { + final EStructuralFeature severityFeature = pb.eClass().getEStructuralFeature("severity"); //$NON-NLS-1$ if (severityFeature != null && "error".equals(((Enumerator) pb.eGet(severityFeature)).getName())) { //$NON-NLS-1$ nbErrors++; } diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFTVM.properties b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFTVM.properties index 0e2f0785..71d95481 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFTVM.properties +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFTVM.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2007, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFVM.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFVM.java index c5da87c8..ed8b92da 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFVM.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFVM.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFVM.properties b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFVM.properties index 472d7668..e7f8873b 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFVM.properties +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionEMFVM.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2007, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionVM.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionVM.java index d230e5a3..71db6d55 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionVM.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionVM.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionVM.properties b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionVM.properties index ec5f3a68..fc474093 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionVM.properties +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/unit/atlvm/TestNonRegressionVM.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2007, 2012 Obeo. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/FileUtils.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/FileUtils.java index 4c1aaaba..63ccb1c3 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/FileUtils.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/FileUtils.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/InitParserData.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/InitParserData.java index d5e6e7f1..1ba0679b 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/InitParserData.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/InitParserData.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL extractor diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/LaunchParser.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/LaunchParser.java index e35bb3e5..b43cd3fb 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/LaunchParser.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/LaunchParser.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/ModelUtils.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/ModelUtils.java index 363f354b..18eae1c9 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/ModelUtils.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/ModelUtils.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2007, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - ATL tester diff --git a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/WikiOutputter.java b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/WikiOutputter.java index 5aaed866..26feecf7 100644 --- a/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/WikiOutputter.java +++ b/tests/org.eclipse.m2m.atl.tests/src/org/eclipse/m2m/atl/tests/util/WikiOutputter.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Obeo - Wiki utilities diff --git a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/.gitignore b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/.gitignore new file mode 100644 index 00000000..830384a8 --- /dev/null +++ b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/.gitignore @@ -0,0 +1 @@ +*.asm diff --git a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2ATL.atl b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2ATL.atl index e944d933..17b7d8ec 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2ATL.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2ATL.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2AntScripts.atl b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2AntScripts.atl index ab5e7e0a..d7b809bf 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2AntScripts.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2AntScripts.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2PropertiesFile.atl b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2PropertiesFile.atl index b64db0b4..50f81148 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2PropertiesFile.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AML2PropertiesFile.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AMLLibrary.atl b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AMLLibrary.atl index cc24d7d2..f3c3b4a7 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AMLLibrary.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AMLLibrary.atl @@ -3,9 +3,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AntScript2XML.atl b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AntScript2XML.atl index f1cb8e9f..60fcd8f1 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AntScript2XML.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/AntScript2XML.atl @@ -3,9 +3,9 @@ -- ****************************************************************************** -- Copyright (c) 2007, 2008 INRIA. -- All rights reserved. This program and the accompanying materials --- are made available under the terms of the Eclipse Public License v1.0 +-- are made available under the terms of the Eclipse Public License v2.0 -- which accompanies this distribution, and is available at --- http://www.eclipse.org/legal/epl-v10.html +-- https://www.eclipse.org/legal/epl-2.0/ -- -- Contributors: -- INRIA - Initial implementation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/MatchingMetrics.atl b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/MatchingMetrics.atl index 3c464027..24b57740 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/MatchingMetrics.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/dsls/AML/ATL/MatchingMetrics.atl @@ -3,9 +3,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/about.html b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/about.html index 88f469ad..044c0c86 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/about.html +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 2009</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/AmlActionActivator.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/AmlActionActivator.java index 87f13221..da53be71 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/AmlActionActivator.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/AmlActionActivator.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/popup/actions/ActionGenerateEmptyEqualModel.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/popup/actions/ActionGenerateEmptyEqualModel.java index 82090bc4..2eb4b0e4 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/popup/actions/ActionGenerateEmptyEqualModel.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/popup/actions/ActionGenerateEmptyEqualModel.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/popup/actions/ActionGeneratePropFile.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/popup/actions/ActionGeneratePropFile.java index 045c7ef1..3a1cc836 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/popup/actions/ActionGeneratePropFile.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.actions/src/org/eclipse/m2m/atl/research/aml/actions/popup/actions/ActionGeneratePropFile.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/about.html b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/about.html index 88f469ad..044c0c86 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/about.html +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 2009</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/Activator.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/Activator.java index 8779fc1c..082fdc57 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/Activator.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/Activator.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlBuildVisitor.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlBuildVisitor.java index 52e59d9b..dd50fbcf 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlBuildVisitor.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlBuildVisitor.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlBuilder.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlBuilder.java index 78975bc6..1d1b360e 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlBuilder.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlBuilder.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlNature.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlNature.java index 971279db..5501381b 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlNature.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.builder/src/org/eclipse/m2m/atl/research/aml/builder/AmlNature.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/about.html b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/about.html index 88f469ad..044c0c86 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/about.html +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 2009</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/match/match/AML2AntScriptsUtils.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/match/match/AML2AntScriptsUtils.java index daa38ab8..c79c59fd 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/match/match/AML2AntScriptsUtils.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/match/match/AML2AntScriptsUtils.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/match/match/MatchingMetricsUtils.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/match/match/MatchingMetricsUtils.java index a34ec069..22374ab6 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/match/match/MatchingMetricsUtils.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/match/match/MatchingMetricsUtils.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/Aml2009Compiler.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/Aml2009Compiler.java index 6230e609..2977d470 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/Aml2009Compiler.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/Aml2009Compiler.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlCompiler.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlCompiler.java index b6370ef3..6e622590 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlCompiler.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlCompiler.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlDefaultCompiler.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlDefaultCompiler.java index bce1dc4f..5866ecef 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlDefaultCompiler.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlDefaultCompiler.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlEnginePlugin.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlEnginePlugin.java index bcddcd16..562aab77 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlEnginePlugin.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlEnginePlugin.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlModelUtils.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlModelUtils.java index 53a48c31..74dbf0fb 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlModelUtils.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlModelUtils.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlResourceManager.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlResourceManager.java index 16bcab1b..4643cc91 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlResourceManager.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlResourceManager.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlStandaloneCompiler.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlStandaloneCompiler.java index 88e16dcd..90e921f1 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlStandaloneCompiler.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/AmlStandaloneCompiler.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/SemanticProblemException.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/SemanticProblemException.java index efa90d7a..8f1ca378 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/SemanticProblemException.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/engine/SemanticProblemException.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/split/EMFSplitter.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/split/EMFSplitter.java index 6a25aba7..78965b57 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/split/EMFSplitter.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/split/EMFSplitter.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/split/Splitter.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/split/Splitter.java index 9d8c8930..77005d87 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/split/Splitter.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/split/Splitter.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/aml/AML_ANTLR3Lexer.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/aml/AML_ANTLR3Lexer.java index dd27faf2..a291502a 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/aml/AML_ANTLR3Lexer.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/aml/AML_ANTLR3Lexer.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/aml/AML_ANTLR3Parser.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/aml/AML_ANTLR3Parser.java index f674f841..b1e2fa5c 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/aml/AML_ANTLR3Parser.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/aml/AML_ANTLR3Parser.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/properties/Properties_ANTLR3Lexer.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/properties/Properties_ANTLR3Lexer.java index da250d01..84f77480 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/properties/Properties_ANTLR3Lexer.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/properties/Properties_ANTLR3Lexer.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/properties/Properties_ANTLR3Parser.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/properties/Properties_ANTLR3Parser.java index 28b7e0e2..14e29188 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/properties/Properties_ANTLR3Parser.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/atl/research/aml/tcs/injector/properties/Properties_ANTLR3Parser.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/research/aml/tcs/injector/ModifiedEMFTCSInjector.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/research/aml/tcs/injector/ModifiedEMFTCSInjector.java index fccf78f2..a702843d 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/research/aml/tcs/injector/ModifiedEMFTCSInjector.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.engine/src/org/eclipse/m2m/research/aml/tcs/injector/ModifiedEMFTCSInjector.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 INRIA, Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Guillaume Doux - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/about.html b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/about.html index 88f469ad..044c0c86 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/about.html +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 2009</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlActivator.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlActivator.java index 7c8ba566..1ec5f339 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlActivator.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlActivator.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlUIException.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlUIException.java index f3da00d4..91672f29 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlUIException.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlUIException.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlUIResourceManager.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlUIResourceManager.java index 96e0c650..cd3e8d86 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlUIResourceManager.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/AmlUIResourceManager.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/EqualModelUtils.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/EqualModelUtils.java index 57a41b10..2da575b3 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/EqualModelUtils.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/EqualModelUtils.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/ModelUtils.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/ModelUtils.java index f2eba772..038a9007 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/ModelUtils.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/ModelUtils.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/ResourceUtils.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/ResourceUtils.java index f35be1c5..921988ed 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/ResourceUtils.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.utils/src/org/eclipse/m2m/atl/research/aml/utils/ResourceUtils.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/about.html b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/about.html index 88f469ad..044c0c86 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/about.html +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>November 2009</p> +<p>August 1, 2019</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/Activator.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/Activator.java index 92aa971c..8ed9439c 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/Activator.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/Activator.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/AmlProjectWizard.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/AmlProjectWizard.java index a932536a..453dc4df 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/AmlProjectWizard.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/AmlProjectWizard.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/AmlProjectWizardPage.java b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/AmlProjectWizardPage.java index ca544740..5b7b7aa9 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/AmlProjectWizardPage.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/plugins/org.eclipse.m2m.atl.research.aml.wizard/src/org/eclipse/m2m/atl/research/aml/wizard/AmlProjectWizardPage.java @@ -2,9 +2,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/.gitignore b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/.gitignore new file mode 100644 index 00000000..830384a8 --- /dev/null +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/.gitignore @@ -0,0 +1 @@ +*.asm diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/ConceptualLink.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/ConceptualLink.atl index be0eecb2..3b5213d9 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/ConceptualLink.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/ConceptualLink.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Differentiation.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Differentiation.atl index 9d2449b0..7ab0cda4 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Differentiation.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Differentiation.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/FlattenFeatures.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/FlattenFeatures.atl index 4d7193c5..1e08d41f 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/FlattenFeatures.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/FlattenFeatures.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Propagation.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Propagation.atl index de335ba1..2d58b298 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Propagation.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Propagation.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Rewriting.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Rewriting.atl index d1edbe7f..c59cfe79 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Rewriting.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/Rewriting.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/TypeDifferentiation.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/TypeDifferentiation.atl index e93bae2a..fd8a720f 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/TypeDifferentiation.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/EcoreMetametamodel/TypeDifferentiation.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/.gitignore b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/.gitignore new file mode 100644 index 00000000..830384a8 --- /dev/null +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/.gitignore @@ -0,0 +1 @@ +*.asm diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/HOT_ConceptualLink.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/HOT_ConceptualLink.atl index d1777ad4..8eacdd08 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/HOT_ConceptualLink.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/HOT_ConceptualLink.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/HOT_match.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/HOT_match.atl index 2929c649..e5998ede 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/HOT_match.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/HOT/HOT_match.atl @@ -3,9 +3,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/.gitignore b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/.gitignore new file mode 100644 index 00000000..830384a8 --- /dev/null +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/.gitignore @@ -0,0 +1 @@ +*.asm diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/EcoreMetametamodel.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/EcoreMetametamodel.atl index fe5983ed..700521e3 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/EcoreMetametamodel.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/EcoreMetametamodel.atl @@ -3,9 +3,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/EqualMM.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/EqualMM.atl index d30d2f7c..f74d9da5 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/EqualMM.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/EqualMM.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/KM3Metametamodel.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/KM3Metametamodel.atl index d61cfe11..952cc552 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/KM3Metametamodel.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/KM3Metametamodel.atl @@ -3,9 +3,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/Metametamodel.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/Metametamodel.atl index 61002d92..c7d48e59 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/Metametamodel.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/Metametamodel.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/Strings.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/Strings.atl index 049cc2ce..6fdae764 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/Strings.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/Helpers/Strings.atl @@ -4,9 +4,9 @@ -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/.gitignore b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/.gitignore new file mode 100644 index 00000000..830384a8 --- /dev/null +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/.gitignore @@ -0,0 +1 @@ +*.asm diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/ConceptualLink.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/ConceptualLink.atl index b3e7aff0..ac02b89a 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/ConceptualLink.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/ConceptualLink.atl @@ -2,9 +2,9 @@ --/******************************************************************************* -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Differentiation.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Differentiation.atl index bb58d713..c9826f51 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Differentiation.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Differentiation.atl @@ -2,9 +2,9 @@ --/******************************************************************************* -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/FlattenFeatures.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/FlattenFeatures.atl index 207c10a9..d5f7db65 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/FlattenFeatures.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/FlattenFeatures.atl @@ -2,9 +2,9 @@ --/******************************************************************************* -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Propagation.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Propagation.atl index 09538276..6b80b20d 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Propagation.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Propagation.atl @@ -2,9 +2,9 @@ --/******************************************************************************* -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Rewriting.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Rewriting.atl index f3c5fc6e..e280f61f 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Rewriting.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/Rewriting.atl @@ -2,9 +2,9 @@ --/******************************************************************************* -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/TypeDifferentiation.atl b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/TypeDifferentiation.atl index d700d4a3..2870a96e 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/TypeDifferentiation.atl +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/ATL/KM3Metametamodel/TypeDifferentiation.atl @@ -2,9 +2,9 @@ --/******************************************************************************* -- * Copyright (c) 2009 Ecole des Mines de Nantes. -- * All rights reserved. This program and the accompanying materials --- * are made available under the terms of the Eclipse Public License v1.0 +-- * are made available under the terms of the Eclipse Public License v2.0 -- * which accompanies this distribution, and is available at --- * http://www.eclipse.org/legal/epl-v10.html +-- * https://www.eclipse.org/legal/epl-2.0/ -- * -- * Contributors: -- * Kelly Garces - initial implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/AmwModelHandler.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/AmwModelHandler.java index 2e246a35..12b44c82 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/AmwModelHandler.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/AmwModelHandler.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/DistractorFilter.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/DistractorFilter.java index 41edb11a..95785ca0 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/DistractorFilter.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/DistractorFilter.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/HTTPRequest.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/HTTPRequest.java index 3b7c3334..f6e289a2 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/HTTPRequest.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/HTTPRequest.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/HyphenTokenizer.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/HyphenTokenizer.java index eed68594..864425c2 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/HyphenTokenizer.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/HyphenTokenizer.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/MSR.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/MSR.java index 388f418c..bc718437 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/MSR.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/MSR.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/MSRSimilarity.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/MSRSimilarity.java index 65f72c67..8a742ed4 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/MSRSimilarity.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/MSRSimilarity.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/SymbolTokenizer.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/SymbolTokenizer.java index a6ca5968..a313ebe3 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/SymbolTokenizer.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/SymbolTokenizer.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/TermProcessor.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/TermProcessor.java index 4c8363e6..f99e8748 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/TermProcessor.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/TermProcessor.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/Tokenizer.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/Tokenizer.java index 1b808476..be3ef2a4 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/Tokenizer.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/Tokenizer.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/UnderScoreTokenizer.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/UnderScoreTokenizer.java index bf7111bd..6eb53dd2 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/UnderScoreTokenizer.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/UnderScoreTokenizer.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation diff --git a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/UpperCaseTokenizer.java b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/UpperCaseTokenizer.java index 5cc44bc5..fa094afd 100644 --- a/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/UpperCaseTokenizer.java +++ b/usecases/org.eclipse.m2m.atl.research.aml/runtime/AMLLibrary/src/match/UpperCaseTokenizer.java @@ -3,9 +3,9 @@ * Copyright (c) 2009 Ecole des Mines de Nantes. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Kelly Garces - initial API and implementation and/or initial documentation |
