various fixes to match HEAD.
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml
index 349ff17..aa46472 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml
+++ b/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml
@@ -8,7 +8,7 @@
<!-- Full blown JSDT FACET -->
-
+ <!--
<extension point="org.eclipse.wst.common.project.facet.core.facets">
<category id="jsdt.category">
<label>JavaScript Development Toolkit</label>
@@ -49,7 +49,7 @@
</supported>
</extension>
-
+ -->
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java
index dd82b49..58dbb88 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * bug:244839 - eugene@genuitec.com
*
* Provisional API: This class/interface is part of an interim API that is still under development and expected to
* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
@@ -255,6 +256,11 @@
* @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getCompilationUnit()
*/
public IJavaScriptUnit getCompilationUnit() {
+ // Genuitec Begin Fix 6149: Exception opening external HTML file
+ if (!getJavaProject().exists()) {
+ return null;
+ }
+ // Genuitec End Fix 6149: Exception opening external HTML file
synchronized (fLock) {
try {
if (fCompilationUnit == null) {
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java
index 8112da7..6587f7f 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * bug:244839 - eugene@genuitec.com
*******************************************************************************/
package org.eclipse.wst.jsdt.web.ui.views.contentoutline;
@@ -241,6 +242,11 @@
startOffset = ((NodeImpl) node).getStartOffset();
endOffset = ((NodeImpl) node).getEndOffset();
IJavaScriptUnit unit = getLazyCu(node);
+ // Genuitec Begin Fix 6149: Exception opening external HTML file
+ if (unit == null) {
+ return new Object[0];
+ }
+ // Genuitec End Fix 6149: Exception opening external HTML file
try {
if(ensureConsistant) unit.makeConsistent(getProgressMonitor());
} catch (JavaScriptModelException ex1) {
@@ -327,6 +333,8 @@
IJsTranslation tran = getTranslation(node);
if(tran== null) return null;
lazyCu = tran.getCompilationUnit();
+ if(lazyCu==null) return null;
+
try {
lazyCu.makeConsistent( new NullProgressMonitor() );
} catch (JavaScriptModelException e) {
