search/index docs opening an HTML file first would prevent the JsTranslator from listening for doc changes.
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslation.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslation.java
index fc003b5..4e350fc 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslation.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslation.java
@@ -76,15 +76,17 @@
private JsTranslator translator;
private String mangledName;
+ private boolean listenForChanges;
- public JsTranslation(IStructuredDocument htmlDocument, IJavaProject javaProj) {
- fLock = new byte[0];
- fJavaProject = javaProj;
- fHtmlDocument = htmlDocument;
- setBaseLocation();
- translator = new JsTranslator(htmlDocument, fModelBaseLocation);
- mangledName = createMangledName();
- }
+// public JsTranslation(IStructuredDocument htmlDocument, IJavaProject javaProj) {
+// fLock = new byte[0];
+// fJavaProject = javaProj;
+// fHtmlDocument = htmlDocument;
+// setBaseLocation();
+// translator = new JsTranslator(htmlDocument, fModelBaseLocation);
+// mangledName = createMangledName();
+// listenForChanges = true;
+// }
public JsTranslation(IStructuredDocument htmlDocument, IJavaProject javaProj, boolean listenForChanges) {
fLock = new byte[0];
@@ -93,6 +95,7 @@
setBaseLocation();
translator = new JsTranslator(htmlDocument, fModelBaseLocation,listenForChanges);
mangledName = createMangledName();
+ this.listenForChanges=listenForChanges;
}
public IJavaProject getJavaProject() {
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapter.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapter.java
index cbb2e29..8c5d553 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapter.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapter.java
@@ -40,19 +40,20 @@
private JsTranslation fJSPTranslation = null;
private NullProgressMonitor fTranslationMonitor = null;
private String baseLocation;
+ private boolean listenForChanges=false;
- public JsTranslationAdapter(IDOMModel xmlModel, boolean listenForProjectChanges) {
+ public JsTranslationAdapter(IDOMModel xmlModel) {
fHtmlDocument = xmlModel.getStructuredDocument();
baseLocation = xmlModel.getBaseLocation();
initializeJavaPlugins();
+
+ }
+ public void shouldListenForChanges(boolean listenForProjectChanges) {
if(listenForProjectChanges) {
ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- }else {
- fJSPTranslation = new JsTranslation(fHtmlDocument, getJavaProject(), listenForProjectChanges);
}
}
-
public IJavaProject getJavaProject() {
IJavaProject javaProject = null;
@@ -74,10 +75,15 @@
*
* @return a JSPTranslationExtension
*/
- public JsTranslation getJSPTranslation() {
- if (fJSPTranslation == null) {
- fJSPTranslation = new JsTranslation(fHtmlDocument, getJavaProject());
+ public JsTranslation getJSPTranslation(boolean listenForChanges) {
+ if (fJSPTranslation == null && !this.listenForChanges && listenForChanges) {
+
+ if(fJSPTranslation!=null) fJSPTranslation.release();
+
+ fJSPTranslation = new JsTranslation(fHtmlDocument, getJavaProject(),listenForChanges);
+ this.listenForChanges=listenForChanges;
}
+ shouldListenForChanges(listenForChanges);
return fJSPTranslation;
}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapterFactory.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapterFactory.java
index 5b178d5..fa1efb3 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapterFactory.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapterFactory.java
@@ -39,18 +39,15 @@
listenForProjectChanges = true;
}
- public JsTranslationAdapterFactory(boolean listenForProjectChanges) {
- super(IJsTranslation.class, true);
- this.listenForProjectChanges = listenForProjectChanges;
- }
+
public INodeAdapterFactory copy() {
- return new JsTranslationAdapterFactory(listenForProjectChanges);
+ return new JsTranslationAdapterFactory();
}
protected INodeAdapter createAdapter(INodeNotifier target) {
if (target instanceof IDOMNode && fAdapter == null) {
- fAdapter = new JsTranslationAdapter(((IDOMNode) target).getModel(), listenForProjectChanges);
+ fAdapter = new JsTranslationAdapter(((IDOMNode) target).getModel());
if (JsTranslationAdapterFactory.DEBUG) {
System.out.println("(+) JSPTranslationAdapterFactory [" + this + "] created adapter: " + fAdapter); //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslator.java
index 49b6d53..257fef3 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslator.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslator.java
@@ -226,7 +226,6 @@
}
private void finishedTranslation() {
-
if(compUnitBuff!=null) compUnitBuff.setContents(fScriptText.toString());
}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java
index 35e1afb..5c87877 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java
@@ -130,11 +130,11 @@
// handle unsupported
if (model instanceof IDOMModel) {
IDOMModel xmlModel = (IDOMModel) model;
- JsTranslationAdapterFactory factory = new JsTranslationAdapterFactory(false);
+ JsTranslationAdapterFactory factory = new JsTranslationAdapterFactory();
xmlModel.getFactoryRegistry().addFactory(factory);
IDOMDocument doc = xmlModel.getDocument();
JsTranslationAdapter adapter = (JsTranslationAdapter) doc.getAdapterFor(IJsTranslation.class);
- translation = adapter.getJSPTranslation();
+ translation = adapter.getJSPTranslation(false);
}
} catch (IOException e) {
Logger.logException(e);
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsBatchValidator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsBatchValidator.java
index 36c2c00..40523d4 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsBatchValidator.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsBatchValidator.java
@@ -74,6 +74,7 @@
// for debugging
static final boolean DEBUG = Boolean.valueOf(Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspvalidator")).booleanValue(); //$NON-NLS-1$
private static final String PLUGIN_ID_JSP_CORE = "org.eclipse.wst.jsdt.web.core"; //$NON-NLS-1$
+ private IPath[] excludeLibPaths;
/**
* Gets current validation project configuration based on current project
@@ -203,6 +204,9 @@
fJSPJavaValidator.cleanup(reporter);
}
private IPath[] getLibraryPaths(IFile file) {
+
+ if(excludeLibPaths!=null) return excludeLibPaths;
+
IProject project = file.getProject();
IJavaProject javaProject= JavaCore.create(project);
@@ -220,15 +224,16 @@
if(entries[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
IClasspathAttribute[] attribs = entries[i].getExtraAttributes();
for(int k=0; attribs!=null && k<attribs.length;k++) {
- if(attribs[k].getName().equalsIgnoreCase("validate") && attribs[k].getName().equalsIgnoreCase("false")) {
- ignorePaths.add(entries[k].getPath());
+ if(attribs[k].getName().equalsIgnoreCase("validate") && attribs[k].getValue().equalsIgnoreCase("false")) {
+ ignorePaths.add(entries[i].getPath());
continue nextEntry;
}
}
}
}
- return (Path[])ignorePaths.toArray(new Path[ignorePaths.size()]);
+ excludeLibPaths = (Path[])ignorePaths.toArray(new Path[ignorePaths.size()]);
+ return excludeLibPaths;
}
@@ -415,9 +420,10 @@
}
private boolean shouldValidate(IFile file) {
+ //if(true) return true;
IResource resource = file;
IPath[] libPaths = getLibraryPaths(file);
- IPath filePath = file.getLocation().removeLastSegments(1);
+ IPath filePath = file.getFullPath().removeLastSegments(1);
for(int i = 0;i<libPaths.length;i++) {
if(libPaths[i].isPrefixOf(filePath)){
return false;
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java
index 4da40cb..d1cb58d 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java
@@ -80,7 +80,7 @@
IDOMDocument xmlDoc = domModel.getDocument();
JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
//translationAdapter.resourceChanged();
- JsTranslation translation = translationAdapter.getJSPTranslation();
+ JsTranslation translation = translationAdapter.getJSPTranslation(false);
if (!reporter.isCancelled()) {
translation.setProblemCollectingActive(true);
translation.reconcileCompilationUnit();
@@ -104,7 +104,7 @@
*/
private void setupAdapterFactory(IStructuredModel sm) {
if (sm.getFactoryRegistry().getFactoryFor(IJsTranslation.class) == null) {
- JsTranslationAdapterFactory factory = new JsTranslationAdapterFactory(false);
+ JsTranslationAdapterFactory factory = new JsTranslationAdapterFactory();
sm.getFactoryRegistry().addFactory(factory);
}
}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java
index 0f6e482..8aed39d 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java
@@ -68,7 +68,7 @@
fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
}
if (fTranslationAdapter != null) {
- return fTranslationAdapter.getJSPTranslation();
+ return fTranslationAdapter.getJSPTranslation(true);
}
} catch (Exception e) {
// TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java
index 149b556..19c0434 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java
@@ -61,7 +61,7 @@
fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
}
if (fTranslationAdapter != null) {
- JsTranslation translation = fTranslationAdapter.getJSPTranslation();
+ JsTranslation translation = fTranslationAdapter.getJSPTranslation(true);
fJavaPosition = getDocumentPosition();
try {
ICompilationUnit cu = translation.getCompilationUnit();
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java
index c3aeba8..0e89158 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java
@@ -25,7 +25,7 @@
IDOMDocument xmlDoc = xmlModel.getDocument();
JsTranslationAdapter fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
if (fTranslationAdapter != null) {
- fTranslation = fTranslationAdapter.getJSPTranslation();
+ fTranslation = fTranslationAdapter.getJSPTranslation(true);
}
} catch (Exception e) {
// TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java
index 90b9255..7e083ad 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java
@@ -57,7 +57,7 @@
JsTranslationAdapter fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
if (fTranslationAdapter != null) {
- return fTranslationAdapter.getJSPTranslation();
+ return fTranslationAdapter.getJSPTranslation(true);
}
} catch (Exception e) {
// TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java
index 1ba89db..8a45990 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java
@@ -171,7 +171,7 @@
IDOMDocument xmlDoc = xmlModel.getDocument();
JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
if (translationAdapter != null) {
- tran = translationAdapter.getJSPTranslation();
+ tran = translationAdapter.getJSPTranslation(true);
}
} finally {
if (xmlModel != null) {
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java
index 914756c..173e5a2 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java
@@ -205,7 +205,7 @@
IDOMDocument xmlDoc = xmlModel.getDocument();
JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
if (adapter != null) {
- translation = adapter.getJSPTranslation();
+ translation = adapter.getJSPTranslation(true);
}
}
} finally {
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java
index 2e392ef..0d54b97 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java
@@ -40,7 +40,7 @@
IDOMDocument xmlDoc = xmlModel.getDocument();
JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
if (adapter != null) {
- JsTranslation translation = adapter.getJSPTranslation();
+ JsTranslation translation = adapter.getJSPTranslation(true);
elements = translation.getElementsFromJsRange(textSelection.getOffset(), textSelection.getOffset() + textSelection.getLength());
}
}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java
index 7cd72c7..bfa2ad6 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java
@@ -52,7 +52,7 @@
IDOMDocument xmlDoc = ((IDOMModel) model).getDocument();
JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
if (adapter != null) {
- JsTranslation translation = adapter.getJSPTranslation();
+ JsTranslation translation = adapter.getJSPTranslation(true);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102211
elements = translation.getElementsFromJsRange(selection.getOffset(), selection.getOffset() + selection.getLength());
}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java
index fba2261..ea76957 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java
@@ -97,7 +97,7 @@
IDOMDocument xmlDoc = xmlModel.getDocument();
JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
if (adapter != null) {
- JsTranslation translation = adapter.getJSPTranslation();
+ JsTranslation translation = adapter.getJSPTranslation(true);
IJavaElement[] result = translation.getElementsFromJsRange(hoverRegion.getOffset(), hoverRegion.getOffset() + hoverRegion.getLength());
// Vector filteredResults = new Vector();
// List badFunctions = translation.getGeneratedFunctionNames();
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 d5eae0a..48c14be 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
@@ -313,7 +313,7 @@
return null;
}
JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
- return translationAdapter.getJSPTranslation();
+ return translationAdapter.getJSPTranslation(true);
}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java
index 3a22899..652d9ee 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java
@@ -250,7 +250,7 @@
return null;
}
JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
- return translationAdapter.getJSPTranslation();
+ return translationAdapter.getJSPTranslation(true);
}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java
index cdccc86..dea8299 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java
@@ -144,7 +144,7 @@
return null;
}
JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
- return translationAdapter.getJSPTranslation();
+ return translationAdapter.getJSPTranslation(true);
}
