1 NPE fix, changes to context menu/nature installer.
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java
index 8e4b3f8..6b7c8bf 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java
@@ -135,8 +135,7 @@
// , fOutputLocation
if (!hasProjectClassPathFile()) {
fJavaProject.setRawClasspath((IClasspathEntry[]) classPathEntries.toArray(new IClasspathEntry[] {}), fOutputLocation, monitor);
- }
- if (hasProjectClassPathFile()) {
+ }else{
fJavaProject.setRawClasspath((IClasspathEntry[]) classPathEntries.toArray(new IClasspathEntry[] {}), monitor);
}
} catch (Exception e) {
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
index e3fee56..20db014 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
@@ -674,7 +674,31 @@
id="org.eclipse.wst.jsdt.launching.WebProject">
</classpathContainerInitializer>
</extension>
- <extension
+ <extension
+ point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true"
+ id="org.eclipse.wst.jsdt.web.ui.jsdtSetup">
+ <menu
+ label="Web Development Tools"
+ id="org.eclipse.wst.jsdt.web.ui.project.tools">
+ <separator
+ name="group0">
+ </separator>
+ </menu>
+ <action
+ class="org.eclipse.wst.jsdt.web.ui.SetupProjectsWizzard"
+ label="Add JavaScript Support"
+ menubarPath="org.eclipse.wst.jsdt.web.ui.project.tools/group0"
+ enablesFor="+"
+ id="org.eclipse.wst.jsdt.internal.web.ui.convertProjects">
+ </action>
+ </objectContribution>
+ </extension>
+ <!-- Uncomment for Standalone + HTML as seperate options -->
+ <!--
+ <extension
point="org.eclipse.ui.popupMenus">
<objectContribution
objectClass="org.eclipse.core.resources.IProject"
@@ -689,4 +713,5 @@
</action>
</objectContribution>
</extension>
+ -->
</plugin>
