Skip to content

Commit e6e33fd

Browse files
author
Paul Verest
committed
Merge pull request #102 from Enide/master
new features and work in progress 0.9
2 parents 93f21d2 + 29b7978 commit e6e33fd

File tree

90 files changed

+18820
-2177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+18820
-2177
lines changed

chromedevtools/plugins/org.chromium.debug.core/src/org/chromium/debug/core/model/JavascriptVmEmbedderFactory.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,15 @@ public JavascriptVmEmbedder attach(JavascriptVmEmbedder.Listener embedderListene
282282
DebugEventListener debugEventListener)
283283
throws CoreException {
284284
embedderListener = null;
285+
//+ @since 0.9 modified exception message string
286+
String ERROR_STRING = "Nodeclipse/chromedevtools failed to connect to Standalone V8 VM\n"
287+
+"( Check Help (F1) and Support http://www.nodeclipse.org/#support ). info:"+;
285288
try {
286289
standaloneVm.attach(debugEventListener);
287290
} catch (IOException e) {
288-
throw newCoreException("Failed to connect to Standalone V8 VM", e);
291+
throw newCoreException(ERROR_STRING, e);
289292
} catch (UnsupportedVersionException e) {
290-
throw newCoreException("Failed to connect to Standalone V8 VM", e);
293+
throw newCoreException(ERROR_STRING, e);
291294
}
292295
return new JavascriptVmEmbedder() {
293296
public JavascriptVm getJavascriptVm() {
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.nodeclipse.enide.editors.gradle.feature</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.pde.FeatureBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.pde.FeatureNature</nature>
16+
</natures>
17+
</projectDescription>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bin.includes = feature.xml
Lines changed: 239 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,239 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<feature
3+
id="org.nodeclipse.enide.editors.gradle.feature"
4+
label="Minimalist Gradle Editor"
5+
version="0.8.0.qualifier"
6+
provider-name="Paul Verest">
7+
8+
<description url="http://www.nodeclipse.org/">
9+
Minimalist Gradle Editor gives you minimal Editor for build.gradle
10+
files.
11+
It has highlight for keywords, strings and matching brackets.
12+
13+
For full-featured Gradle tools check Gradle Integration for Eclipse by Pivotal
14+
http://marketplace.eclipse.org/content/gradle-integration-eclipse
15+
</description>
16+
17+
<copyright url="http://www.nodeclipse.org/">
18+
Copyright (c) 2012, 2013, 2014 The Nodeclipse Authors. All rights reserved.
19+
</copyright>
20+
21+
<license url="http://www.apache.org/licenses/LICENSE-2.0">
22+
Copyright (c) 2012, 2013 The Nodeclipse Authors. All rights reserved.
23+
24+
Apache License
25+
Version 2.0, January 2004
26+
http://www.apache.org/licenses/
27+
28+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
29+
30+
1. Definitions.
31+
32+
&quot;License&quot; shall mean the terms and conditions for use, reproduction,
33+
and distribution as defined by Sections 1 through 9 of this document.
34+
35+
&quot;Licensor&quot; shall mean the copyright owner or entity authorized by
36+
the copyright owner that is granting the License.
37+
38+
&quot;Legal Entity&quot; shall mean the union of the acting entity and all
39+
other entities that control, are controlled by, or are under common
40+
control with that entity. For the purposes of this definition,
41+
&quot;control&quot; means (i) the power, direct or indirect, to cause the
42+
direction or management of such entity, whether by contract or
43+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
44+
outstanding shares, or (iii) beneficial ownership of such entity.
45+
46+
&quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
47+
exercising permissions granted by this License.
48+
49+
&quot;Source&quot; form shall mean the preferred form for making modifications,
50+
including but not limited to software source code, documentation
51+
source, and configuration files.
52+
53+
&quot;Object&quot; form shall mean any form resulting from mechanical
54+
transformation or translation of a Source form, including but
55+
not limited to compiled object code, generated documentation,
56+
and conversions to other media types.
57+
58+
&quot;Work&quot; shall mean the work of authorship, whether in Source or
59+
Object form, made available under the License, as indicated by a
60+
copyright notice that is included in or attached to the work
61+
(an example is provided in the Appendix below).
62+
63+
&quot;Derivative Works&quot; shall mean any work, whether in Source or Object
64+
form, that is based on (or derived from) the Work and for which the
65+
editorial revisions, annotations, elaborations, or other modifications
66+
represent, as a whole, an original work of authorship. For the purposes
67+
of this License, Derivative Works shall not include works that remain
68+
separable from, or merely link (or bind by name) to the interfaces of,
69+
the Work and Derivative Works thereof.
70+
71+
&quot;Contribution&quot; shall mean any work of authorship, including
72+
the original version of the Work and any modifications or additions
73+
to that Work or Derivative Works thereof, that is intentionally
74+
submitted to Licensor for inclusion in the Work by the copyright owner
75+
or by an individual or Legal Entity authorized to submit on behalf of
76+
the copyright owner. For the purposes of this definition, &quot;submitted&quot;
77+
means any form of electronic, verbal, or written communication sent
78+
to the Licensor or its representatives, including but not limited to
79+
communication on electronic mailing lists, source code control systems,
80+
and issue tracking systems that are managed by, or on behalf of, the
81+
Licensor for the purpose of discussing and improving the Work, but
82+
excluding communication that is conspicuously marked or otherwise
83+
designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
84+
85+
&quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
86+
on behalf of whom a Contribution has been received by Licensor and
87+
subsequently incorporated within the Work.
88+
89+
2. Grant of Copyright License. Subject to the terms and conditions of
90+
this License, each Contributor hereby grants to You a perpetual,
91+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
92+
copyright license to reproduce, prepare Derivative Works of,
93+
publicly display, publicly perform, sublicense, and distribute the
94+
Work and such Derivative Works in Source or Object form.
95+
96+
3. Grant of Patent License. Subject to the terms and conditions of
97+
this License, each Contributor hereby grants to You a perpetual,
98+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
99+
(except as stated in this section) patent license to make, have made,
100+
use, offer to sell, sell, import, and otherwise transfer the Work,
101+
where such license applies only to those patent claims licensable
102+
by such Contributor that are necessarily infringed by their
103+
Contribution(s) alone or by combination of their Contribution(s)
104+
with the Work to which such Contribution(s) was submitted. If You
105+
institute patent litigation against any entity (including a
106+
cross-claim or counterclaim in a lawsuit) alleging that the Work
107+
or a Contribution incorporated within the Work constitutes direct
108+
or contributory patent infringement, then any patent licenses
109+
granted to You under this License for that Work shall terminate
110+
as of the date such litigation is filed.
111+
112+
4. Redistribution. You may reproduce and distribute copies of the
113+
Work or Derivative Works thereof in any medium, with or without
114+
modifications, and in Source or Object form, provided that You
115+
meet the following conditions:
116+
117+
(a) You must give any other recipients of the Work or
118+
Derivative Works a copy of this License; and
119+
120+
(b) You must cause any modified files to carry prominent notices
121+
stating that You changed the files; and
122+
123+
(c) You must retain, in the Source form of any Derivative Works
124+
that You distribute, all copyright, patent, trademark, and
125+
attribution notices from the Source form of the Work,
126+
excluding those notices that do not pertain to any part of
127+
the Derivative Works; and
128+
129+
(d) If the Work includes a &quot;NOTICE&quot; text file as part of its
130+
distribution, then any Derivative Works that You distribute must
131+
include a readable copy of the attribution notices contained
132+
within such NOTICE file, excluding those notices that do not
133+
pertain to any part of the Derivative Works, in at least one
134+
of the following places: within a NOTICE text file distributed
135+
as part of the Derivative Works; within the Source form or
136+
documentation, if provided along with the Derivative Works; or,
137+
within a display generated by the Derivative Works, if and
138+
wherever such third-party notices normally appear. The contents
139+
of the NOTICE file are for informational purposes only and
140+
do not modify the License. You may add Your own attribution
141+
notices within Derivative Works that You distribute, alongside
142+
or as an addendum to the NOTICE text from the Work, provided
143+
that such additional attribution notices cannot be construed
144+
as modifying the License.
145+
146+
You may add Your own copyright statement to Your modifications and
147+
may provide additional or different license terms and conditions
148+
for use, reproduction, or distribution of Your modifications, or
149+
for any such Derivative Works as a whole, provided Your use,
150+
reproduction, and distribution of the Work otherwise complies with
151+
the conditions stated in this License.
152+
153+
5. Submission of Contributions. Unless You explicitly state otherwise,
154+
any Contribution intentionally submitted for inclusion in the Work
155+
by You to the Licensor shall be under the terms and conditions of
156+
this License, without any additional terms or conditions.
157+
Notwithstanding the above, nothing herein shall supersede or modify
158+
the terms of any separate license agreement you may have executed
159+
with Licensor regarding such Contributions.
160+
161+
6. Trademarks. This License does not grant permission to use the trade
162+
names, trademarks, service marks, or product names of the Licensor,
163+
except as required for reasonable and customary use in describing the
164+
origin of the Work and reproducing the content of the NOTICE file.
165+
166+
7. Disclaimer of Warranty. Unless required by applicable law or
167+
agreed to in writing, Licensor provides the Work (and each
168+
Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
169+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
170+
implied, including, without limitation, any warranties or conditions
171+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
172+
PARTICULAR PURPOSE. You are solely responsible for determining the
173+
appropriateness of using or redistributing the Work and assume any
174+
risks associated with Your exercise of permissions under this License.
175+
176+
8. Limitation of Liability. In no event and under no legal theory,
177+
whether in tort (including negligence), contract, or otherwise,
178+
unless required by applicable law (such as deliberate and grossly
179+
negligent acts) or agreed to in writing, shall any Contributor be
180+
liable to You for damages, including any direct, indirect, special,
181+
incidental, or consequential damages of any character arising as a
182+
result of this License or out of the use or inability to use the
183+
Work (including but not limited to damages for loss of goodwill,
184+
work stoppage, computer failure or malfunction, or any and all
185+
other commercial damages or losses), even if such Contributor
186+
has been advised of the possibility of such damages.
187+
188+
9. Accepting Warranty or Additional Liability. While redistributing
189+
the Work or Derivative Works thereof, You may choose to offer,
190+
and charge a fee for, acceptance of support, warranty, indemnity,
191+
or other liability obligations and/or rights consistent with this
192+
License. However, in accepting such obligations, You may act only
193+
on Your own behalf and on Your sole responsibility, not on behalf
194+
of any other Contributor, and only if You agree to indemnify,
195+
defend, and hold each Contributor harmless for any liability
196+
incurred by, or claims asserted against, such Contributor by reason
197+
of your accepting any such warranty or additional liability.
198+
199+
END OF TERMS AND CONDITIONS
200+
201+
APPENDIX: How to apply the Apache License to your work.
202+
203+
To apply the Apache License to your work, attach the following
204+
boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
205+
replaced with your own identifying information. (Don&apos;t include
206+
the brackets!) The text should be enclosed in the appropriate
207+
comment syntax for the file format. We also recommend that a
208+
file or class name and description of purpose be included on the
209+
same &quot;printed page&quot; as the copyright notice for easier
210+
identification within third-party archives.
211+
212+
Copyright (c) 2012, 2013 The Nodeclipse Authors. All rights reserved.
213+
214+
Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
215+
you may not use this file except in compliance with the License.
216+
You may obtain a copy of the License at
217+
218+
http://www.apache.org/licenses/LICENSE-2.0
219+
220+
Unless required by applicable law or agreed to in writing, software
221+
distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
222+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
223+
See the License for the specific language governing permissions and
224+
limitations under the License.
225+
</license>
226+
227+
<url>
228+
<update label="Nodeclipse Updates" url="http://www.nodeclipse/updates/"/>
229+
<discovery label="Nodeclipse Updates" url="http://www.nodeclipse.org/updates"/>
230+
</url>
231+
232+
<plugin
233+
id="org.nodeclipse.enide.editors.gradle"
234+
download-size="0"
235+
install-size="0"
236+
version="0.0.0"
237+
unpack="false"/>
238+
239+
</feature>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>org.nodeclipse.nodeclipse-1</groupId>
9+
<artifactId>parent</artifactId>
10+
<version>0.8.0-SNAPSHOT</version>
11+
<relativePath>../../pom.xml</relativePath>
12+
</parent>
13+
14+
<artifactId>org.nodeclipse.enide.editors.gradle.feature</artifactId>
15+
<packaging>eclipse-feature</packaging>
16+
17+
<name>org.nodeclipse.enide.editors.gradle.feature</name>
18+
<description>org.nodeclipse.enide.editors.gradle.feature Minimalist Gradle Editor</description>
19+
</project>
20+

features/org.nodeclipse.jjs.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<feature
33
id="org.nodeclipse.jjs.feature"
4-
label="Nodeclipse JJS"
4+
label="Nodeclipse Java 8 Nashorn JJS"
55
version="0.8.0.qualifier"
66
provider-name="Nodeclipse organization">
77

org.nodeclipse.debug/plugin.xml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,25 @@
130130
</contextualLaunch>
131131
</shortcut>
132132
</extension>
133+
133134
<!-- http://stackoverflow.com/questions/1437323/assigning-a-keyboard-shortcut-for-a-specific-eclipse-build-configuration -->
134-
<extension point="org.eclipse.ui.commands">
135-
<command id="org.nodeclipse.nodejs.run"
136-
categoryId="org.eclipse.debug.ui.category.run"
137-
name="Run as Node Application"
138-
description="Run as Node Application"/>
139-
</extension>
140-
<!-- binding can be configured by user in Properties -> General -> Keys
141-
142-
<extension point="org.eclipse.ui.bindings">
143-
<key sequence="M1+R"
144-
contextId="org.eclipse.ui.globalScope" <- Referenced identifier 'org.eclipse.ui.globalScope' in attribute 'contextId' cannot be found
145-
commandId="org.nodeclipse.nodejs.run"
146-
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
147-
</extension>
148-
-->
135+
<extension point="org.eclipse.ui.commands">
136+
<command id="org.nodeclipse.nodejs.run"
137+
categoryId="org.eclipse.debug.ui.category.run"
138+
name="Run Node Application"
139+
description="Run Node Application"/>
140+
</extension>
141+
<!-- binding can be configured by user in Properties -> General -> Keys (or Ctrl+Sh+L twice)
142+
http://help.eclipse.org/indigo/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Freference%2Fextension-points%2Forg_eclipse_ui_bindings.html
143+
M1 is the COMMAND key on MacOS X, and the CTRL key on most other platforms.
144+
-->
145+
<extension point="org.eclipse.ui.bindings">
146+
<key sequence="M1+R"
147+
commandId="org.nodeclipse.nodejs.run"
148+
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
149+
contextId="org.eclipse.ui.contexts.window" />
150+
</extension>
151+
149152

150153
<!-- node run/debug with monitor-->
151154
<extension

0 commit comments

Comments
 (0)