[nobug] Misc. cleanup of org.eclipse.wst.jsdt.core package Fixed up some test cases as well
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 da48aa6..3592f50 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
@@ -192,7 +192,7 @@ */ private IJavaScriptUnit createCompilationUnit() throws JavaScriptModelException { IPackageFragmentRoot root = getDocScope(true); - IJavaScriptUnit cu = root.getPackageFragment("").getJavaScriptUnit(getMangledName() + JsDataTypes.BASE_FILE_EXTENSION).getWorkingCopy(getWorkingCopyOwner(), getProblemRequestor(), getProgressMonitor()); //$NON-NLS-1$ + IJavaScriptUnit cu = root.getPackageFragment("").getJavaScriptUnit(getMangledName() + JsDataTypes.BASE_FILE_EXTENSION).getWorkingCopy(getWorkingCopyOwner(), getProgressMonitor()); //$NON-NLS-1$ IBuffer buffer; try { buffer = cu.getBuffer(); @@ -228,14 +228,12 @@ } Vector validChildren = new Vector(); for (int i = 0; i < allChildren.length; i++) { - if (allChildren[i].getElementType() != IJavaScriptElement.PACKAGE_DECLARATION) { - ISourceRange range = getJSSourceRangeOf(allChildren[i]); - if (javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd)) { - validChildren.add(allChildren[i]); - } - else if (allChildren[i].getElementType() == IJavaScriptElement.TYPE) { - validChildren.add(allChildren[i]); - } + ISourceRange range = getJSSourceRangeOf(allChildren[i]); + if (javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd)) { + validChildren.add(allChildren[i]); + } + else if (allChildren[i].getElementType() == IJavaScriptElement.TYPE) { + validChildren.add(allChildren[i]); } } if (validChildren.size() > 0) { @@ -273,7 +271,7 @@ } getDocScope(true); try { - fCompilationUnit = fCompilationUnit.getWorkingCopy(getWorkingCopyOwner(), getProblemRequestor(), getProgressMonitor()); + fCompilationUnit = fCompilationUnit.getWorkingCopy(getWorkingCopyOwner(), getProgressMonitor()); // fCompilationUnit.makeConsistent(getProgressMonitor()); } catch (JavaScriptModelException ex) {
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 1f09d5a..f8aef7c 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
@@ -189,7 +189,7 @@ Vector validChildren = new Vector(); for (int i = 0; i < allChildren.length; i++) { - if (allChildren[i] instanceof IJavaScriptElement && allChildren[i].getElementType() != IJavaScriptElement.PACKAGE_DECLARATION) { + if (allChildren[i] instanceof IJavaScriptElement) { ISourceRange range = null; if (allChildren[i] instanceof Member) { try {