From b0c5fee79d83cee0ab3d099544fd815ab75b3b64 Mon Sep 17 00:00:00 2001 From: Johan Compagner Date: Fri, 11 Jul 2014 09:50:16 +0200 Subject: [PATCH 1/7] removed license stuff (done through a license plugin) --- .../sourceTemplateFeature/feature.properties | 136 ------------------ 1 file changed, 136 deletions(-) diff --git a/features/org.eclipse.dltk.javascript-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.dltk.javascript-feature/sourceTemplateFeature/feature.properties index a24fef19..4d46ec7f 100644 --- a/features/org.eclipse.dltk.javascript-feature/sourceTemplateFeature/feature.properties +++ b/features/org.eclipse.dltk.javascript-feature/sourceTemplateFeature/feature.properties @@ -48,139 +48,3 @@ updateSiteName=Dynamic Languages Toolkit Update Site # "description" property - description of the feature description=Dynamic Languages Toolkit Javascript IDE. (source code) - -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== - -# "license" property - text of the "Feature Update License" -# should be plain text version of license agreement pointed to be "licenseURL" -license=\ -Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ -\n\ -Usage Of Content\n\ -\n\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the\n\ -Eclipse Foundation is provided to you under the terms and conditions of\n\ -the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ -provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ -For purposes of the EPL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse Foundation source code\n\ -repository ("Repository") in software modules ("Modules") and made available\n\ -as downloadable archives ("Downloads").\n\ -\n\ - - 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\ - - 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\ -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\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are\n\ -currently may have restrictions on the import, possession, and use,\n\ -and/or re-export to another country, of encryption software. BEFORE\n\ -using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use, and\n\ -re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n -########### end of license property ########################################## From 62a6f881e145e5772fad0463186266108188ca03 Mon Sep 17 00:00:00 2001 From: Johan Compagner Date: Wed, 6 Aug 2014 17:31:55 +0200 Subject: [PATCH 2/7] give the stacklevel to the getProperty --- .../javascript/internal/debug/ui/JavaScriptDebugHover.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/debug/ui/JavaScriptDebugHover.java b/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/debug/ui/JavaScriptDebugHover.java index 79ee8674..ec69e4d4 100644 --- a/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/debug/ui/JavaScriptDebugHover.java +++ b/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/debug/ui/JavaScriptDebugHover.java @@ -100,7 +100,8 @@ public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { .getDbgpSession().getCoreCommands(); try { - IDbgpProperty property = propCmds.getProperty(snippet); + IDbgpProperty property = propCmds.getProperty(snippet, + frame.getLevel()); return getResultText(snippet, ScriptValue.createValue(frame, property)); } catch (Exception e) { From d4d9a1745efb28a59942d3a659028aafa2159ace Mon Sep 17 00:00:00 2001 From: Johan Compagner Date: Tue, 12 Aug 2014 09:50:14 +0200 Subject: [PATCH 3/7] they can be shared over multiply threads (by caches) so these can be altered by threads --- .../eclipse/dltk/internal/javascript/ti/ElementValue.java | 3 ++- .../dltk/internal/javascript/ti/ImmutableValue.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ElementValue.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ElementValue.java index d0d6c3c0..f2438ea7 100644 --- a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ElementValue.java +++ b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ElementValue.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import org.eclipse.dltk.annotations.Internal; import org.eclipse.dltk.compiler.problem.IProblemIdentifier; @@ -356,7 +357,7 @@ public static ElementValue createClass(ITypeSystem context, Type type) { static class TypeValue extends ElementValue implements IValue { - private final Map children = new HashMap( + private final Map children = new ConcurrentHashMap( 4, 0.9f); private final JSTypeSet types; diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ImmutableValue.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ImmutableValue.java index b62ef973..dce162eb 100644 --- a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ImmutableValue.java +++ b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ImmutableValue.java @@ -6,6 +6,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import org.eclipse.dltk.javascript.typeinference.ReferenceKind; import org.eclipse.dltk.javascript.typeinference.ReferenceLocation; @@ -290,16 +291,19 @@ protected IValue findMember(String name, boolean resolve) { value = ElementValue.findMemberA(declaredType, name, resolve); if (value != null) { if (elementValues == null) - elementValues = new HashMap(4, 0.9f); + elementValues = new ConcurrentHashMap( + 4, 0.9f); elementValues.put(name, value); return value; + } } for (IRType type : types) { value = ElementValue.findMemberA(type, name, resolve); if (value != null) { if (elementValues == null) - elementValues = new HashMap(4, 0.9f); + elementValues = new ConcurrentHashMap( + 4, 0.9f); if (resolve && value instanceof ElementValue) { value = ((ElementValue) value).resolveValue(); } From 08d33329de9ec440c52d78c988458cf1b321bbee Mon Sep 17 00:00:00 2001 From: Kaloyan Raev Date: Fri, 17 Oct 2014 15:49:36 +0300 Subject: [PATCH 4/7] Prepare repo for easier versioning --- features/org.eclipse.dltk.javascript-feature/pom.xml | 4 +--- features/org.eclipse.dltk.javascript.sdk/pom.xml | 4 +--- features/org.eclipse.dltk.javascript.tests/pom.xml | 4 +--- .../pom.xml | 4 +--- .../pom.xml | 4 +--- plugins/org.eclipse.dltk.javascript.core/pom.xml | 4 +--- plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml | 4 +--- plugins/org.eclipse.dltk.javascript.debug/pom.xml | 4 +--- plugins/org.eclipse.dltk.javascript.formatter/pom.xml | 4 +--- .../pom.xml | 4 +--- .../pom.xml | 4 +--- .../org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml | 4 +--- plugins/org.eclipse.dltk.javascript.launching/pom.xml | 4 +--- plugins/org.eclipse.dltk.javascript.parser/pom.xml | 4 +--- .../org.eclipse.dltk.javascript.rhino.dbgp/pom.xml | 4 +--- plugins/org.eclipse.dltk.javascript.rhino/pom.xml | 4 +--- plugins/org.eclipse.dltk.javascript.ui/pom.xml | 4 +--- pom.xml | 11 +++++------ tests/org.eclipse.dltk.javascript.core.tests/pom.xml | 10 ++++------ .../pom.xml | 10 ++++------ .../org.eclipse.dltk.javascript.parser.tests/pom.xml | 10 ++++------ tests/org.eclipse.dltk.javascript.ui.tests/pom.xml | 10 ++++------ tests/pom.xml | 10 ++++------ update.site/pom.xml | 4 +--- 24 files changed, 43 insertions(+), 90 deletions(-) diff --git a/features/org.eclipse.dltk.javascript-feature/pom.xml b/features/org.eclipse.dltk.javascript-feature/pom.xml index 44a7c500..7a7a710b 100644 --- a/features/org.eclipse.dltk.javascript-feature/pom.xml +++ b/features/org.eclipse.dltk.javascript-feature/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript - 5.1.0-SNAPSHOT eclipse-feature diff --git a/features/org.eclipse.dltk.javascript.sdk/pom.xml b/features/org.eclipse.dltk.javascript.sdk/pom.xml index e4728b11..e35720d7 100644 --- a/features/org.eclipse.dltk.javascript.sdk/pom.xml +++ b/features/org.eclipse.dltk.javascript.sdk/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.sdk - 5.1.0-SNAPSHOT eclipse-feature diff --git a/features/org.eclipse.dltk.javascript.tests/pom.xml b/features/org.eclipse.dltk.javascript.tests/pom.xml index 91152989..be3e7fab 100644 --- a/features/org.eclipse.dltk.javascript.tests/pom.xml +++ b/features/org.eclipse.dltk.javascript.tests/pom.xml @@ -5,10 +5,8 @@ features org.eclipse.dltk - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT - org.eclipse.dltk org.eclipse.dltk.javascript.tests - 5.1.0-SNAPSHOT eclipse-feature diff --git a/plugins/org.eclipse.dltk.javascript.core.dom.support/pom.xml b/plugins/org.eclipse.dltk.javascript.core.dom.support/pom.xml index 3b7b01b8..419de897 100644 --- a/plugins/org.eclipse.dltk.javascript.core.dom.support/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.core.dom.support/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.core.dom.support - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.core.manipulation/pom.xml b/plugins/org.eclipse.dltk.javascript.core.manipulation/pom.xml index 7b7d2f90..495d6b67 100644 --- a/plugins/org.eclipse.dltk.javascript.core.manipulation/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.core.manipulation/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.core.manipulation - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.core/pom.xml b/plugins/org.eclipse.dltk.javascript.core/pom.xml index c16175c5..396bbf80 100644 --- a/plugins/org.eclipse.dltk.javascript.core/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.core/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.core - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml b/plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml index 40e3c407..85e1754b 100644 --- a/plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.debug.ui - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.debug/pom.xml b/plugins/org.eclipse.dltk.javascript.debug/pom.xml index 4cecbe61..e4ae8571 100644 --- a/plugins/org.eclipse.dltk.javascript.debug/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.debug/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.debug - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.formatter/pom.xml b/plugins/org.eclipse.dltk.javascript.formatter/pom.xml index 4a69ca79..b2b97f80 100644 --- a/plugins/org.eclipse.dltk.javascript.formatter/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.formatter/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.formatter - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/pom.xml b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/pom.xml index 9c5c3d90..13444556 100644 --- a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.jdt.integration.ui - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration/pom.xml b/plugins/org.eclipse.dltk.javascript.jdt.integration/pom.xml index fd47748a..16f6fb17 100644 --- a/plugins/org.eclipse.dltk.javascript.jdt.integration/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.jdt.integration/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.jdt.integration - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml index 24aaaf89..6a03c9f7 100644 --- a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.jsjdtdebugger - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.launching/pom.xml b/plugins/org.eclipse.dltk.javascript.launching/pom.xml index e003b31b..113e5397 100644 --- a/plugins/org.eclipse.dltk.javascript.launching/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.launching/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.launching - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.parser/pom.xml b/plugins/org.eclipse.dltk.javascript.parser/pom.xml index 92300b6c..a52d46c0 100644 --- a/plugins/org.eclipse.dltk.javascript.parser/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.parser/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.parser - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.rhino.dbgp/pom.xml b/plugins/org.eclipse.dltk.javascript.rhino.dbgp/pom.xml index f6568e98..14e7288d 100644 --- a/plugins/org.eclipse.dltk.javascript.rhino.dbgp/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.rhino.dbgp/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk org.eclipse.dltk.javascript.rhino.dbgp - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.rhino/pom.xml b/plugins/org.eclipse.dltk.javascript.rhino/pom.xml index 9e68d6ae..6436367c 100644 --- a/plugins/org.eclipse.dltk.javascript.rhino/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.rhino/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.rhino - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.dltk.javascript.ui/pom.xml b/plugins/org.eclipse.dltk.javascript.ui/pom.xml index 2179c9fa..43934c1e 100644 --- a/plugins/org.eclipse.dltk.javascript.ui/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.ui/pom.xml @@ -5,11 +5,9 @@ org.eclipse.dltk.javascript javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ../.. - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.ui - 5.1.0-SNAPSHOT eclipse-plugin diff --git a/pom.xml b/pom.xml index db390306..41289e57 100644 --- a/pom.xml +++ b/pom.xml @@ -3,15 +3,14 @@ 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"> 4.0.0 - org.eclipse.dltk.javascript - javascript - 1.0.0-SNAPSHOT org.eclipse.dltk - parent - 1.0.0-SNAPSHOT - ../org.eclipse.dltk.releng/build/parent/pom.xml + dltk + 5.1.0-SNAPSHOT + ../org.eclipse.dltk.releng/build/pom.xml + org.eclipse.dltk.javascript + javascript pom features/org.eclipse.dltk.javascript-feature diff --git a/tests/org.eclipse.dltk.javascript.core.tests/pom.xml b/tests/org.eclipse.dltk.javascript.core.tests/pom.xml index a3a5420e..b062a1d3 100644 --- a/tests/org.eclipse.dltk.javascript.core.tests/pom.xml +++ b/tests/org.eclipse.dltk.javascript.core.tests/pom.xml @@ -5,13 +5,11 @@ 4.0.0 org.eclipse.dltk.javascript - javascript - 1.0.0-SNAPSHOT - ../.. + javascript.tests + 5.1.0-SNAPSHOT + ../pom.xml - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.core.tests - 5.1.0-SNAPSHOT eclipse-test-plugin @@ -24,7 +22,7 @@ org.eclipse.dltk.core org.eclipse.dltk.core.targetplatform - 5.1.0-SNAPSHOT + ${project.version} diff --git a/tests/org.eclipse.dltk.javascript.formatter.tests/pom.xml b/tests/org.eclipse.dltk.javascript.formatter.tests/pom.xml index bbe3f007..f551923b 100644 --- a/tests/org.eclipse.dltk.javascript.formatter.tests/pom.xml +++ b/tests/org.eclipse.dltk.javascript.formatter.tests/pom.xml @@ -4,13 +4,11 @@ 4.0.0 org.eclipse.dltk.javascript - javascript - 1.0.0-SNAPSHOT - ../.. + javascript.tests + 5.1.0-SNAPSHOT + ../pom.xml - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.formatter.tests - 5.1.0-SNAPSHOT eclipse-test-plugin @@ -23,7 +21,7 @@ org.eclipse.dltk.core org.eclipse.dltk.core.targetplatform - 5.1.0-SNAPSHOT + ${project.version} diff --git a/tests/org.eclipse.dltk.javascript.parser.tests/pom.xml b/tests/org.eclipse.dltk.javascript.parser.tests/pom.xml index ed473f40..08c11376 100644 --- a/tests/org.eclipse.dltk.javascript.parser.tests/pom.xml +++ b/tests/org.eclipse.dltk.javascript.parser.tests/pom.xml @@ -4,13 +4,11 @@ 4.0.0 org.eclipse.dltk.javascript - javascript - 1.0.0-SNAPSHOT - ../.. + javascript.tests + 5.1.0-SNAPSHOT + ../pom.xml - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.parser.tests - 5.1.0-SNAPSHOT eclipse-test-plugin @@ -23,7 +21,7 @@ org.eclipse.dltk.core org.eclipse.dltk.core.targetplatform - 5.1.0-SNAPSHOT + ${project.version} diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/pom.xml b/tests/org.eclipse.dltk.javascript.ui.tests/pom.xml index a1ae92a3..9eadc8d6 100644 --- a/tests/org.eclipse.dltk.javascript.ui.tests/pom.xml +++ b/tests/org.eclipse.dltk.javascript.ui.tests/pom.xml @@ -4,13 +4,11 @@ 4.0.0 org.eclipse.dltk.javascript - javascript - 1.0.0-SNAPSHOT - ../.. + javascript.tests + 5.1.0-SNAPSHOT + ../pom.xml - org.eclipse.dltk.javascript org.eclipse.dltk.javascript.ui.tests - 5.1.0-SNAPSHOT eclipse-test-plugin @@ -51,7 +49,7 @@ org.eclipse.dltk.core org.eclipse.dltk.core.targetplatform - 5.1.0-SNAPSHOT + ${project.version} diff --git a/tests/pom.xml b/tests/pom.xml index bb4ad318..04bea36f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,14 +4,12 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.eclipse.dltk - parent - 1.0.0-SNAPSHOT - ../../org.eclipse.dltk.releng/build/parent/pom.xml + org.eclipse.dltk.javascript + javascript + 5.1.0-SNAPSHOT + ../pom.xml - org.eclipse.dltk.javascript javascript.tests - 1.0.0-SNAPSHOT pom org.eclipse.dltk.javascript.core.tests diff --git a/update.site/pom.xml b/update.site/pom.xml index b39883b7..2fd6ca9c 100644 --- a/update.site/pom.xml +++ b/update.site/pom.xml @@ -6,11 +6,9 @@ javascript org.eclipse.dltk.javascript - 1.0.0-SNAPSHOT + 5.1.0-SNAPSHOT - org.eclipse.dltk.javascript org.eclipse.dltk.javascript-updatesite - 1.0.0-SNAPSHOT eclipse-update-site From 10f99a6592d157f87a0467ad39ce250fd33904d4 Mon Sep 17 00:00:00 2001 From: Kaloyan Raev Date: Fri, 17 Oct 2014 22:18:32 +0300 Subject: [PATCH 5/7] Change version to 5.1.1 --- features/org.eclipse.dltk.javascript-feature/feature.xml | 2 +- features/org.eclipse.dltk.javascript-feature/pom.xml | 2 +- features/org.eclipse.dltk.javascript.sdk/feature.xml | 2 +- features/org.eclipse.dltk.javascript.sdk/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.core.manipulation/pom.xml | 2 +- plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.core/pom.xml | 2 +- .../org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml | 2 +- plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.debug/pom.xml | 2 +- .../org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.formatter/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.jdt.integration.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.jdt.integration/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml | 2 +- .../org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.launching/pom.xml | 2 +- plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.parser/pom.xml | 2 +- .../org.eclipse.dltk.javascript.rhino.dbgp/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.rhino.dbgp/pom.xml | 2 +- plugins/org.eclipse.dltk.javascript.rhino/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.rhino/pom.xml | 2 +- plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.dltk.javascript.ui/pom.xml | 2 +- pom.xml | 2 +- .../org.eclipse.dltk.javascript.core.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.dltk.javascript.core.tests/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.dltk.javascript.formatter.tests/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.dltk.javascript.parser.tests/pom.xml | 2 +- tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.dltk.javascript.ui.tests/pom.xml | 2 +- tests/pom.xml | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/features/org.eclipse.dltk.javascript-feature/feature.xml b/features/org.eclipse.dltk.javascript-feature/feature.xml index 842ad367..edfb1aa8 100644 --- a/features/org.eclipse.dltk.javascript-feature/feature.xml +++ b/features/org.eclipse.dltk.javascript-feature/feature.xml @@ -17,7 +17,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript diff --git a/features/org.eclipse.dltk.javascript.sdk/feature.xml b/features/org.eclipse.dltk.javascript.sdk/feature.xml index 6f080887..0e55abb5 100644 --- a/features/org.eclipse.dltk.javascript.sdk/feature.xml +++ b/features/org.eclipse.dltk.javascript.sdk/feature.xml @@ -2,7 +2,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.sdk diff --git a/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF index 47951c78..923a198c 100644 --- a/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.dltk.javascript.core.manipulation;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.dltk.internal.javascript.core.manipulation.JavascriptManipulationPlugin Bundle-Vendor: %pluginProvider Require-Bundle: org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.dltk.javascript.core.manipulation/pom.xml b/plugins/org.eclipse.dltk.javascript.core.manipulation/pom.xml index 495d6b67..ae305edb 100644 --- a/plugins/org.eclipse.dltk.javascript.core.manipulation/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.core.manipulation/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.core.manipulation diff --git a/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF index cc654adc..70487b68 100644 --- a/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.dltk.javascript.core;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Vendor: %pluginProvider Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.dltk.javascript.core/pom.xml b/plugins/org.eclipse.dltk.javascript.core/pom.xml index 396bbf80..f4eec6ce 100644 --- a/plugins/org.eclipse.dltk.javascript.core/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.core/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.core diff --git a/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF index 1ad6957b..4d5c2ec3 100644 --- a/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.dltk.javascript.debug.ui;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Vendor: %pluginProvider Bundle-Localization: plugin Require-Bundle: org.eclipse.debug.ui, diff --git a/plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml b/plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml index 85e1754b..b2094e8e 100644 --- a/plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.debug.ui/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.debug.ui diff --git a/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF index 3324f2ef..75c48b15 100644 --- a/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.dltk.javascript.debug;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Vendor: %pluginProvider Bundle-Localization: plugin Require-Bundle: org.eclipse.dltk.debug, diff --git a/plugins/org.eclipse.dltk.javascript.debug/pom.xml b/plugins/org.eclipse.dltk.javascript.debug/pom.xml index e4ae8571..cc02a718 100644 --- a/plugins/org.eclipse.dltk.javascript.debug/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.debug/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.debug diff --git a/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF index 34fd4892..00df6443 100644 --- a/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JavaScript Formatter Plug-in Bundle-SymbolicName: org.eclipse.dltk.javascript.formatter;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.dltk.javascript.formatter.JavaScriptFormatterPlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/plugins/org.eclipse.dltk.javascript.formatter/pom.xml b/plugins/org.eclipse.dltk.javascript.formatter/pom.xml index b2b97f80..edf53fbf 100644 --- a/plugins/org.eclipse.dltk.javascript.formatter/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.formatter/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.formatter diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF index 1067dc69..f9206b8e 100644 --- a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: DLTK JS JDT UI Bundle-SymbolicName: org.eclipse.dltk.javascript.jdt.integration.ui;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/pom.xml b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/pom.xml index 13444556..5429e7d2 100644 --- a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.jdt.integration.ui diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF index a4214f5c..2283c721 100644 --- a/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Java Script JDT Integration Plug-in Bundle-SymbolicName: org.eclipse.dltk.javascript.jdt.integration;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.dltk.javascript.jdt.integration.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration/pom.xml b/plugins/org.eclipse.dltk.javascript.jdt.integration/pom.xml index 16f6fb17..123b5dff 100644 --- a/plugins/org.eclipse.dltk.javascript.jdt.integration/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.jdt.integration/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.jdt.integration diff --git a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF index e8c9e3b1..4f8d19b1 100644 --- a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.dltk.javascript.jsjdtdebugger;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.dltk.javascript.jsjdtdebugger.JavaScriptAndJdtDebuggerPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml index 6a03c9f7..fab38960 100644 --- a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.jsjdtdebugger diff --git a/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF index 350658e4..46b9646d 100644 --- a/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.dltk.javascript.launching;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.dltk.javascript.launching.JavaScriptLaunchingPlugin Bundle-Vendor: %pluginProvider Bundle-Localization: plugin diff --git a/plugins/org.eclipse.dltk.javascript.launching/pom.xml b/plugins/org.eclipse.dltk.javascript.launching/pom.xml index 113e5397..9112e22a 100644 --- a/plugins/org.eclipse.dltk.javascript.launching/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.launching/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.launching diff --git a/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF index 52e18535..3ba2a57c 100644 --- a/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JavaScript Parser Bundle-SymbolicName: org.eclipse.dltk.javascript.parser;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.dltk.core;bundle-version="0.0.0", diff --git a/plugins/org.eclipse.dltk.javascript.parser/pom.xml b/plugins/org.eclipse.dltk.javascript.parser/pom.xml index a52d46c0..99469f97 100644 --- a/plugins/org.eclipse.dltk.javascript.parser/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.parser/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.parser diff --git a/plugins/org.eclipse.dltk.javascript.rhino.dbgp/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.rhino.dbgp/META-INF/MANIFEST.MF index c704783e..9dd0358f 100644 --- a/plugins/org.eclipse.dltk.javascript.rhino.dbgp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.rhino.dbgp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: DLTK JavaScript Dbgp Bundle-SymbolicName: org.eclipse.dltk.javascript.rhino.dbgp -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Require-Bundle: org.eclipse.dltk.javascript.rhino Bundle-Vendor: %pluginProvider Bundle-Localization: plugin diff --git a/plugins/org.eclipse.dltk.javascript.rhino.dbgp/pom.xml b/plugins/org.eclipse.dltk.javascript.rhino.dbgp/pom.xml index 14e7288d..fc732add 100644 --- a/plugins/org.eclipse.dltk.javascript.rhino.dbgp/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.rhino.dbgp/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.rhino.dbgp diff --git a/plugins/org.eclipse.dltk.javascript.rhino/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.rhino/META-INF/MANIFEST.MF index 524de7a7..cdfcdcd4 100644 --- a/plugins/org.eclipse.dltk.javascript.rhino/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.rhino/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Rhino Plug-in Bundle-SymbolicName: org.eclipse.dltk.javascript.rhino;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.variables diff --git a/plugins/org.eclipse.dltk.javascript.rhino/pom.xml b/plugins/org.eclipse.dltk.javascript.rhino/pom.xml index 6436367c..1428e873 100644 --- a/plugins/org.eclipse.dltk.javascript.rhino/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.rhino/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.rhino diff --git a/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF index 586b9cbf..16e9e023 100644 --- a/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.dltk.javascript.ui;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.dltk.javascript.internal.ui.JavaScriptUI Bundle-Vendor: %pluginProvider Bundle-Localization: plugin diff --git a/plugins/org.eclipse.dltk.javascript.ui/pom.xml b/plugins/org.eclipse.dltk.javascript.ui/pom.xml index 43934c1e..d26ab38a 100644 --- a/plugins/org.eclipse.dltk.javascript.ui/pom.xml +++ b/plugins/org.eclipse.dltk.javascript.ui/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../.. org.eclipse.dltk.javascript.ui diff --git a/pom.xml b/pom.xml index 41289e57..5e9fb6fd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.eclipse.dltk dltk - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../org.eclipse.dltk.releng/build/pom.xml org.eclipse.dltk.javascript diff --git a/tests/org.eclipse.dltk.javascript.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.dltk.javascript.core.tests/META-INF/MANIFEST.MF index f4e65936..f485f665 100644 --- a/tests/org.eclipse.dltk.javascript.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.dltk.javascript.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JavaScript core Tests Plug-in Bundle-SymbolicName: org.eclipse.dltk.javascript.core.tests;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Require-Bundle: org.junit;bundle-version="4.10.0", org.eclipse.dltk.javascript.core, org.eclipse.dltk.javascript.core.manipulation, diff --git a/tests/org.eclipse.dltk.javascript.core.tests/pom.xml b/tests/org.eclipse.dltk.javascript.core.tests/pom.xml index b062a1d3..7318d7a5 100644 --- a/tests/org.eclipse.dltk.javascript.core.tests/pom.xml +++ b/tests/org.eclipse.dltk.javascript.core.tests/pom.xml @@ -6,7 +6,7 @@ org.eclipse.dltk.javascript javascript.tests - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../pom.xml org.eclipse.dltk.javascript.core.tests diff --git a/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF index 94e03885..c1733b5b 100644 --- a/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JavaScript Tests Plug-in Bundle-SymbolicName: org.eclipse.dltk.javascript.formatter.tests;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.dltk.core;bundle-version="0.0.0", org.eclipse.dltk.formatter.tests, diff --git a/tests/org.eclipse.dltk.javascript.formatter.tests/pom.xml b/tests/org.eclipse.dltk.javascript.formatter.tests/pom.xml index f551923b..19eb05ec 100644 --- a/tests/org.eclipse.dltk.javascript.formatter.tests/pom.xml +++ b/tests/org.eclipse.dltk.javascript.formatter.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript.tests - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../pom.xml org.eclipse.dltk.javascript.formatter.tests diff --git a/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF index 0a689aac..cd83c86b 100644 --- a/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JavaScript Parser Ttests Bundle-SymbolicName: org.eclipse.dltk.javascript.parser.tests -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.dltk.javascript.parser.tests.Activator Require-Bundle: org.eclipse.core.runtime, org.junit, diff --git a/tests/org.eclipse.dltk.javascript.parser.tests/pom.xml b/tests/org.eclipse.dltk.javascript.parser.tests/pom.xml index 08c11376..f3c515c7 100644 --- a/tests/org.eclipse.dltk.javascript.parser.tests/pom.xml +++ b/tests/org.eclipse.dltk.javascript.parser.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript.tests - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../pom.xml org.eclipse.dltk.javascript.parser.tests diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF index 6a44d6a4..97511c6e 100644 --- a/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: org.eclipse.dltk.javascript.ui.tests;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.1.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.emf.ecore, diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/pom.xml b/tests/org.eclipse.dltk.javascript.ui.tests/pom.xml index 9eadc8d6..3d5e23b5 100644 --- a/tests/org.eclipse.dltk.javascript.ui.tests/pom.xml +++ b/tests/org.eclipse.dltk.javascript.ui.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse.dltk.javascript javascript.tests - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../pom.xml org.eclipse.dltk.javascript.ui.tests diff --git a/tests/pom.xml b/tests/pom.xml index 04bea36f..a246c473 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ org.eclipse.dltk.javascript javascript - 5.1.0-SNAPSHOT + 5.1.1-SNAPSHOT ../pom.xml javascript.tests From 0a36eab695c7ecb30da946ff28a8763a0fdacc87 Mon Sep 17 00:00:00 2001 From: Johan Compagner Date: Thu, 18 Dec 2014 15:20:28 +0100 Subject: [PATCH 6/7] fix for illegal code construct that the type that is declared in the jsodc points to the variable it is declared on (and then later on used) --- .../src/org/eclipse/dltk/javascript/typeinfo/RLocalType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/RLocalType.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/RLocalType.java index 12575014..fccb0357 100644 --- a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/RLocalType.java +++ b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/RLocalType.java @@ -88,7 +88,7 @@ private static IValueReference getChild(RLocalType irType, String name, } IValueReference fromChild = getChildFromDeclaredTypes(name, declaredValue.getDeclaredTypes(), set); - if (fromChild == null) { + if (fromChild == null && !PROTOTYPE_PROPERTY.equals(name)) { IValueReference prototype = irType.functionValue .getChild(PROTOTYPE_PROPERTY); fromChild = prototype.getChild(name); From fe0e5db9991b8729b1a363aa2b467930527244bb Mon Sep 17 00:00:00 2001 From: Johan Compagner Date: Thu, 18 Dec 2014 17:51:21 +0100 Subject: [PATCH 7/7] fix to support for Object.create(null) --- .../javascript/ti/TypeInferencerVisitor.java | 15 ++++++++------- .../tests/typeinference/TypeInferenceTests.java | 9 +++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeInferencerVisitor.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeInferencerVisitor.java index 1f0c063d..1087f114 100644 --- a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeInferencerVisitor.java +++ b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeInferencerVisitor.java @@ -408,7 +408,7 @@ protected IValueReference visitAssign(IValueReference left, RTypes.localType(name, context .getParent().getChild(name))); } - } + } else { left.setKind(ReferenceKind.FIELD); final Comment comment = JSDocSupport @@ -536,8 +536,7 @@ public IValueReference visitCallExpression(CallExpression node) { if (methods != null && methods.size() == 1) { final IRMethod method = methods.get(0); IValueReference ref = checkSpecialJavascriptFunctionCalls( - reference, - arguments, method); + reference, arguments, method); if (ref != null) return ref; if (method.isGeneric()) { @@ -597,10 +596,12 @@ protected IValueReference checkSpecialJavascriptFunctionCalls( } } else if (method.getName().equals("create") && RTypes.OBJECT.getDeclaration().equals( - method.getDeclaringType()) && arguments.length > 0) { + method.getDeclaringType()) && arguments.length > 0 + && arguments[0] != null) { AnonymousValue value = new AnonymousValue(); IValue argumentValue = ((IValueProvider) arguments[0]) .getValue(); + if (argumentValue != null) value.getValue().addValue(argumentValue); if (arguments.length == 2) { @@ -616,9 +617,9 @@ protected IValueReference checkSpecialJavascriptFunctionCalls( .getType()).getMember("value"); if (valueMember != null) { newMembers.add(new RRecordMember(member - .getName(), valueMember + .getName(), valueMember .getType(), member - .getSource())); + .getSource())); } valueMember = ((IRRecordType) member .getType()).getMember("get"); @@ -639,7 +640,7 @@ protected IValueReference checkSpecialJavascriptFunctionCalls( } if (newMembers.size() > 0) { value.addValue(ConstantValue.of(RTypes - .recordType(newMembers)), true); + .recordType(newMembers)), true); } } } diff --git a/tests/org.eclipse.dltk.javascript.core.tests/src/org/eclipse/dltk/javascript/core/tests/typeinference/TypeInferenceTests.java b/tests/org.eclipse.dltk.javascript.core.tests/src/org/eclipse/dltk/javascript/core/tests/typeinference/TypeInferenceTests.java index 7bc391a4..9dbda10d 100644 --- a/tests/org.eclipse.dltk.javascript.core.tests/src/org/eclipse/dltk/javascript/core/tests/typeinference/TypeInferenceTests.java +++ b/tests/org.eclipse.dltk.javascript.core.tests/src/org/eclipse/dltk/javascript/core/tests/typeinference/TypeInferenceTests.java @@ -1367,5 +1367,14 @@ public void testReferenceToPropertyAssignedFunction() { assertEquals(20, location.getNameStart()); assertEquals(26, location.getNameEnd()); } + + public void testObjectCreateCallWithNull() { + final StringList code = new StringList(); + code.add("var p = Object.create(null)"); + final IValueCollection collection = inference(code.toString()); + IValueReference func = collection.getChild("p").getChild("hasOwnProperty"); + assertTrue(func.exists()); + + } }