Attachment #101343 for bug #233309

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 233309
Collapse All | Expand All




import org.eclipse.jface.text.Position;
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterForHTML;
import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
import org.eclipse.wst.jsdt.core.IJavaScriptElement;
import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
import org.eclipse.wst.jsdt.core.ISourceRange;
import org.eclipse.wst.jsdt.core.IType;
import org.eclipse.wst.jsdt.core.JavaScriptModelException;

import org.eclipse.wst.jsdt.internal.core.SourceRefElement;
import org.eclipse.wst.jsdt.ui.JavaScriptElementLabelProvider;
import org.eclipse.wst.jsdt.ui.StandardJavaScriptElementContentProvider;
import org.eclipse.wst.jsdt.web.core.internal.Logger;
import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
import org.eclipse.wst.jsdt.web.core.javascript.JsTranslation;
import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
import org.eclipse.wst.xml.core.internal.document.NodeImpl;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
import org.w3c.dom.Node;
/**

					return type.isAnonymous();
				} catch (JavaScriptModelException e) {
					// TODO Auto-generated catch block
					//e.printStackTrace();
				}
			}
		}

						range = ((SourceRefElement)allChildren[i] ).getSourceRange();
					} catch (JavaScriptModelException e) {
						// TODO Auto-generated catch block
						//e.printStackTrace();
					}
				}
				if (allChildren[i].getElementType() == IJavaScriptElement.TYPE || (range != null && javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd))) {
					
				int htmllength = range==null?0:range.getLength();
				int htmloffset = range==null?0:range.getOffset();

				if(ensureConsistant) unit.makeConsistent(getProgressMonitor());
			} catch (JavaScriptModelException ex1) {
				// TODO Auto-generated catch block
				//ex1.printStackTrace();
			}
			try {
				result = filterChildrenForRange(unit.getChildren(),node);
			} catch (JavaScriptModelException ex) {
				// TODO Auto-generated catch block
			//	ex.printStackTrace();
				result = new Object[0];
				lazyCu=null;
			}

				lazyCu.makeConsistent( new NullProgressMonitor() );
			} catch (JavaScriptModelException e) {
				// TODO Auto-generated catch block
				//e.printStackTrace();
			}catch(Exception e){
				// do nothing
			}
		}
		return lazyCu;
	}
	
	private IJsTranslation getTranslation(Node node) {
		IDOMDocument xmlDoc = (IDOMDocument) node.getOwnerDocument();
		IModelManager modelManager = StructuredModelManager.getModelManager();
		IDOMDocument xmlDoc = null;
		try {
			if (modelManager != null) {
				IStructuredDocument doc = ((NodeImpl) node).getStructuredDocument();
				model = modelManager.getExistingModelForRead(doc);
				// model = modelManager.getModelForRead(doc);
			}
			IDOMModel domModel = (IDOMModel) model;
			xmlDoc = domModel.getDocument();
		} catch (Exception e) {
			Logger.logException(e);
		} finally {
			if (model != null) {
				// model.changedModel();
				model.releaseFromRead();
			}
		}
		if (xmlDoc == null) {
			return null;
		}

Return to bug 233309

Lines 17-24 Link Here

(-)src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java (-32 / +10 lines)
17	import org.eclipse.jface.text.Position;	17	import org.eclipse.jface.text.Position;
18	import org.eclipse.swt.graphics.Image;	18	import org.eclipse.swt.graphics.Image;
19	import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterForHTML;	19	import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterForHTML;
20	import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
21	import org.eclipse.wst.jsdt.core.IJavaScriptElement;	20	import org.eclipse.wst.jsdt.core.IJavaScriptElement;
		21	import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
22	import org.eclipse.wst.jsdt.core.ISourceRange;	22	import org.eclipse.wst.jsdt.core.ISourceRange;
23	import org.eclipse.wst.jsdt.core.IType;	23	import org.eclipse.wst.jsdt.core.IType;
24	import org.eclipse.wst.jsdt.core.JavaScriptModelException;	24	import org.eclipse.wst.jsdt.core.JavaScriptModelException;
Lines 26-44 Link Here
26	import org.eclipse.wst.jsdt.internal.core.SourceRefElement;	26	import org.eclipse.wst.jsdt.internal.core.SourceRefElement;
27	import org.eclipse.wst.jsdt.ui.JavaScriptElementLabelProvider;	27	import org.eclipse.wst.jsdt.ui.JavaScriptElementLabelProvider;
28	import org.eclipse.wst.jsdt.ui.StandardJavaScriptElementContentProvider;	28	import org.eclipse.wst.jsdt.ui.StandardJavaScriptElementContentProvider;
29	import org.eclipse.wst.jsdt.web.core.internal.Logger;
30	import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;	29	import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
31	import org.eclipse.wst.jsdt.web.core.javascript.JsTranslation;	30	import org.eclipse.wst.jsdt.web.core.javascript.JsTranslation;
32	import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;	31	import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
33	import org.eclipse.wst.sse.core.StructuredModelManager;
34	import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
35	import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;	32	import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
36	import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
37	import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
38	import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;	33	import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
39	import org.eclipse.wst.xml.core.internal.document.NodeImpl;	34	import org.eclipse.wst.xml.core.internal.document.NodeImpl;
40	import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;	35	import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
41	import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
42	import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;	36	import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
43	import org.w3c.dom.Node;	37	import org.w3c.dom.Node;
44	/**	38	/**
Lines 109-115 Link Here
109	return type.isAnonymous();	103	return type.isAnonymous();
110	} catch (JavaScriptModelException e) {	104	} catch (JavaScriptModelException e) {
111	// TODO Auto-generated catch block	105	// TODO Auto-generated catch block
112	e.printStackTrace();	106	//e.printStackTrace();
113	}	107	}
114	}	108	}
115	}	109	}
Lines 179-188 Link Here
179	range = ((SourceRefElement)allChildren[i] ).getSourceRange();	173	range = ((SourceRefElement)allChildren[i] ).getSourceRange();
180	} catch (JavaScriptModelException e) {	174	} catch (JavaScriptModelException e) {
181	// TODO Auto-generated catch block	175	// TODO Auto-generated catch block
182	e.printStackTrace();	176	//e.printStackTrace();
183	}	177	}
184	}	178	}
185	if (allChildren[i].getElementType() == IJavaScriptElement.TYPE \|\| (javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd))) {	179	if (allChildren[i].getElementType() == IJavaScriptElement.TYPE \|\| (range != null && javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd))) {
186		180
187	int htmllength = range==null?0:range.getLength();	181	int htmllength = range==null?0:range.getLength();
188	int htmloffset = range==null?0:range.getOffset();	182	int htmloffset = range==null?0:range.getOffset();
Lines 220-232 Link Here
220	if(ensureConsistant) unit.makeConsistent(getProgressMonitor());	214	if(ensureConsistant) unit.makeConsistent(getProgressMonitor());
221	} catch (JavaScriptModelException ex1) {	215	} catch (JavaScriptModelException ex1) {
222	// TODO Auto-generated catch block	216	// TODO Auto-generated catch block
223	ex1.printStackTrace();	217	//ex1.printStackTrace();
224	}	218	}
225	try {	219	try {
226	result = filterChildrenForRange(unit.getChildren(),node);	220	result = filterChildrenForRange(unit.getChildren(),node);
227	} catch (JavaScriptModelException ex) {	221	} catch (JavaScriptModelException ex) {
228	// TODO Auto-generated catch block	222	// TODO Auto-generated catch block
229	ex.printStackTrace();	223	// ex.printStackTrace();
230	result = new Object[0];	224	result = new Object[0];
231	lazyCu=null;	225	lazyCu=null;
232	}	226	}
Lines 304-335 Link Here
304	lazyCu.makeConsistent( new NullProgressMonitor() );	298	lazyCu.makeConsistent( new NullProgressMonitor() );
305	} catch (JavaScriptModelException e) {	299	} catch (JavaScriptModelException e) {
306	// TODO Auto-generated catch block	300	// TODO Auto-generated catch block
307	e.printStackTrace();	301	//e.printStackTrace();
		302	}catch(Exception e){
		303	// do nothing
308	}	304	}
309	}	305	}
310	return lazyCu;	306	return lazyCu;
311	}	307	}
312		308
313	private IJsTranslation getTranslation(Node node) {	309	private IJsTranslation getTranslation(Node node) {
314	IStructuredModel model = null;	310	IDOMDocument xmlDoc = (IDOMDocument) node.getOwnerDocument();
315	IModelManager modelManager = StructuredModelManager.getModelManager();
316	IDOMDocument xmlDoc = null;
317	try {
318	if (modelManager != null) {
319	IStructuredDocument doc = ((NodeImpl) node).getStructuredDocument();
320	model = modelManager.getExistingModelForRead(doc);
321	// model = modelManager.getModelForRead(doc);
322	}
323	IDOMModel domModel = (IDOMModel) model;
324	xmlDoc = domModel.getDocument();
325	} catch (Exception e) {
326	Logger.logException(e);
327	} finally {
328	if (model != null) {
329	// model.changedModel();
330	model.releaseFromRead();
331	}
332	}
333	if (xmlDoc == null) {	311	if (xmlDoc == null) {
334	return null;	312	return null;
335	}	313	}