[228098] cleanup API names
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 d113269..fc7ceae 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
@@ -13,8 +13,8 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Path; -import org.eclipse.wst.jsdt.core.IClasspathEntry; -import org.eclipse.wst.jsdt.core.JavaCore; +import org.eclipse.wst.jsdt.core.IIncludePathEntry; +import org.eclipse.wst.jsdt.core.JavaScriptCore; import org.eclipse.wst.jsdt.core.LibrarySuperType; import org.eclipse.wst.jsdt.internal.core.JavaProject; @@ -23,13 +23,13 @@ public class JsWebNature implements IProjectNature { //private static final String FILENAME_CLASSPATH = ".classpath"; //$NON-NLS-1$ // private static final String NATURE_IDS[] = - // {"org.eclipse.wst.jsdt.web.core.embeded.jsNature",JavaCore.NATURE_ID}; + // {"org.eclipse.wst.jsdt.web.core.embeded.jsNature",JavaScriptCore.NATURE_ID}; // //$NON-NLS-1$ - private static final String NATURE_IDS[] = { JavaCore.NATURE_ID }; + private static final String NATURE_IDS[] = { JavaScriptCore.NATURE_ID }; public static final IPath VIRTUAL_BROWSER_CLASSPATH = new Path("org.eclipse.wst.jsdt.launching.baseBrowserLibrary"); //$NON-NLS-1$ public static final String VIRTUAL_CONTAINER = "org.eclipse.wst.jsdt.launching.WebProject"; //$NON-NLS-1$ - public static final IClasspathEntry VIRTUAL_SCOPE_ENTRY = JavaCore.newContainerEntry(new Path(VIRTUAL_CONTAINER)); + public static final IIncludePathEntry VIRTUAL_SCOPE_ENTRY = JavaScriptCore.newContainerEntry(new Path(VIRTUAL_CONTAINER)); private static final String SUPER_TYPE_NAME = "Window"; //$NON-NLS-1$ private static final String SUPER_TYPE_LIBRARY = "org.eclipse.wst.jsdt.launching.baseBrowserLibrary"; //$NON-NLS-1$ @@ -45,7 +45,7 @@ String[] prevNatures = description.getNatureIds(); String[] newNatures = new String[prevNatures.length + JsWebNature.NATURE_IDS.length]; System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length); - // newNatures[prevNatures.length] = JavaCore.NATURE_ID; + // newNatures[prevNatures.length] = JavaScriptCore.NATURE_ID; for (int i = 0; i < JsWebNature.NATURE_IDS.length; i++) { newNatures[prevNatures.length + i] = JsWebNature.NATURE_IDS[i]; } @@ -124,7 +124,7 @@ initLocalClassPath(); if (hasProjectClassPathFile()) { - IClasspathEntry[] entries = getRawClassPath(); + IIncludePathEntry[] entries = getRawClassPath(); if (entries != null && entries.length > 0) { classPathEntries.removeAll(Arrays.asList(entries)); classPathEntries.addAll(Arrays.asList(entries)); @@ -132,14 +132,14 @@ } JsWebNature.addJsNature(fCurrProject, monitor); - fJavaProject = (JavaProject) JavaCore.create(fCurrProject); + fJavaProject = (JavaProject) JavaScriptCore.create(fCurrProject); fJavaProject.setProject(fCurrProject); try { // , fOutputLocation if (!hasProjectClassPathFile()) { - fJavaProject.setRawClasspath((IClasspathEntry[]) classPathEntries.toArray(new IClasspathEntry[] {}), fOutputLocation, monitor); + fJavaProject.setRawClasspath((IIncludePathEntry[]) classPathEntries.toArray(new IIncludePathEntry[] {}), fOutputLocation, monitor); }else{ - fJavaProject.setRawClasspath((IClasspathEntry[]) classPathEntries.toArray(new IClasspathEntry[] {}), monitor); + fJavaProject.setRawClasspath((IIncludePathEntry[]) classPathEntries.toArray(new IIncludePathEntry[] {}), monitor); } } catch (Exception e) { System.out.println(e); @@ -155,16 +155,16 @@ return; } // IPath projectPath = fCurrProject.getFullPath(); - // classPathEntries.add(JavaCore.newSourceEntry(projectPath)); + // classPathEntries.add(JavaScriptCore.newSourceEntry(projectPath)); } public void deconfigure() throws CoreException { Vector badEntries = new Vector(); - IClasspathEntry defaultJRELibrary = getJreEntry(); - IClasspathEntry[] localEntries = initLocalClassPath(); + IIncludePathEntry defaultJRELibrary = getJreEntry(); + IIncludePathEntry[] localEntries = initLocalClassPath(); badEntries.add(defaultJRELibrary); badEntries.addAll(Arrays.asList(localEntries)); - IClasspathEntry[] entries = getRawClassPath(); + IIncludePathEntry[] entries = getRawClassPath(); Vector goodEntries = new Vector(); for (int i = 0; i < entries.length; i++) { if (!badEntries.contains(entries[i])) { @@ -173,7 +173,7 @@ } // getJavaProject().removeFromBuildSpec(BUILDER_ID); IPath outputLocation = getJavaProject().getOutputLocation(); - getJavaProject().setRawClasspath((IClasspathEntry[]) goodEntries.toArray(new IClasspathEntry[] {}), outputLocation, monitor); + getJavaProject().setRawClasspath((IIncludePathEntry[]) goodEntries.toArray(new IIncludePathEntry[] {}), outputLocation, monitor); getJavaProject().deconfigure(); JsWebNature.removeJsNature(fCurrProject, monitor); fCurrProject.refreshLocal(IResource.DEPTH_INFINITE, monitor); @@ -181,7 +181,7 @@ public JavaProject getJavaProject() { if (fJavaProject == null) { - fJavaProject = (JavaProject) JavaCore.create(fCurrProject); + fJavaProject = (JavaProject) JavaScriptCore.create(fCurrProject); fJavaProject.setProject(fCurrProject); } return fJavaProject; @@ -191,7 +191,7 @@ return this.fCurrProject; } - private IClasspathEntry[] getRawClassPath() { + private IIncludePathEntry[] getRawClassPath() { JavaProject proj = new JavaProject(); proj.setProject(fCurrProject); return proj.readRawClasspath(); @@ -200,9 +200,9 @@ private boolean hasAValidSourcePath() { if (hasProjectClassPathFile()) { try { - IClasspathEntry[] entries = getRawClassPath(); + IIncludePathEntry[] entries = getRawClassPath(); for (int i = 0; i < entries.length; i++) { - if (entries[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) { + if (entries[i].getEntryKind() == IIncludePathEntry.CPE_SOURCE) { return true; } } @@ -222,14 +222,14 @@ return fCurrProject.getFolder(JavaProject.DEFAULT_PREFERENCES_DIRNAME).getFile(JavaProject.CLASSPATH_FILENAME).exists(); } - private IClasspathEntry getJreEntry() { - return JavaCore.newContainerEntry(new Path(DEFAULT_JRE_PATH)); + private IIncludePathEntry getJreEntry() { + return JavaScriptCore.newContainerEntry(new Path(DEFAULT_JRE_PATH)); } private void initJREEntry() { - IClasspathEntry defaultJRELibrary = getJreEntry(); + IIncludePathEntry defaultJRELibrary = getJreEntry(); try { - IClasspathEntry[] entries = getRawClassPath(); + IIncludePathEntry[] entries = getRawClassPath(); for (int i = 0; i < entries.length; i++) { if (entries[i] == defaultJRELibrary) { return; @@ -243,15 +243,15 @@ } } - private IClasspathEntry[] initLocalClassPath() { + private IIncludePathEntry[] initLocalClassPath() { classPathEntries.add(JsWebNature.VIRTUAL_SCOPE_ENTRY); - IClasspathEntry browserLibrary = JavaCore.newContainerEntry( VIRTUAL_BROWSER_CLASSPATH); + IIncludePathEntry browserLibrary = JavaScriptCore.newContainerEntry( VIRTUAL_BROWSER_CLASSPATH); classPathEntries.add(browserLibrary); //IPath webRoot = WebRootFinder.getWebContentFolder(fCurrProject); - // IClasspathEntry source = JavaCore.newSourceEntry(fCurrProject.getFullPath().append(webRoot).append("/")); + // IIncludePathEntry source = JavaScriptCore.newSourceEntry(fCurrProject.getFullPath().append(webRoot).append("/")); // classPathEntries.add(source); - return new IClasspathEntry[] { JsWebNature.VIRTUAL_SCOPE_ENTRY , browserLibrary/*,source*/}; + return new IIncludePathEntry[] { JsWebNature.VIRTUAL_SCOPE_ENTRY , browserLibrary/*,source*/}; } private void initOutputPath() {
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectJsGlobalScopeContainerInitializer.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectJsGlobalScopeContainerInitializer.java index fb456f3..154bdb1 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectJsGlobalScopeContainerInitializer.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectJsGlobalScopeContainerInitializer.java
@@ -8,8 +8,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.wst.jsdt.core.IClasspathEntry; -import org.eclipse.wst.jsdt.core.IJavaProject; +import org.eclipse.wst.jsdt.core.IIncludePathEntry; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; import org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer; import org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer; import org.eclipse.wst.jsdt.core.compiler.libraries.LibraryLocation; @@ -28,7 +28,7 @@ private static final String MANGLED_BUTT1 = "htm"; //$NON-NLS-1$ private static final String MANGLED_BUTT2 = ".js"; //$NON-NLS-1$ - //private IJavaProject javaProject; + //private IJavaScriptProject javaProject; private static String getUnmangedHtmlPath(String containerPathString) { @@ -50,16 +50,16 @@ * (non-Javadoc) * * @see org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer#canUpdateJsGlobalScopeContainer(org.eclipse.core.runtime.IPath, - * org.eclipse.wst.jsdt.core.IJavaProject) + * org.eclipse.wst.jsdt.core.IJavaScriptProject) */ - public boolean canUpdateJsGlobalScopeContainer(IPath containerPath, IJavaProject project) { + public boolean canUpdateJsGlobalScopeContainer(IPath containerPath, IJavaScriptProject project) { /* dont remove from this project */ return false; } - protected IJsGlobalScopeContainer getContainer(IPath containerPath, IJavaProject project) { + protected IJsGlobalScopeContainer getContainer(IPath containerPath, IJavaScriptProject project) { return this; } @@ -72,10 +72,10 @@ * (non-Javadoc) * * @see org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer#getDescription(org.eclipse.core.runtime.IPath, - * org.eclipse.wst.jsdt.core.IJavaProject) + * org.eclipse.wst.jsdt.core.IJavaScriptProject) */ - public String getDescription(IPath containerPath, IJavaProject javaProject) { + public String getDescription(IPath containerPath, IJavaScriptProject javaProject) { if (containerPath.equals(new Path(JsWebNature.VIRTUAL_CONTAINER))) { return WebProjectJsGlobalScopeContainerInitializer.CONTAINER_DESCRIPTION; } @@ -104,7 +104,7 @@ * @see org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer#getHostPath(org.eclipse.core.runtime.IPath) */ - public URI getHostPath(IPath path, IJavaProject project) { + public URI getHostPath(IPath path, IJavaScriptProject project) { // TODO Auto-generated method stub String htmlPath = WebProjectJsGlobalScopeContainerInitializer.getUnmangedHtmlPath(path.toString()); if (htmlPath != null) { @@ -137,22 +137,22 @@ return new Path(JsWebNature.VIRTUAL_CONTAINER); } - public IClasspathEntry[] getClasspathEntries() { + public IIncludePathEntry[] getClasspathEntries() { - //IClasspathEntry entry=null; + //IIncludePathEntry entry=null; - return new IClasspathEntry[0]; + return new IIncludePathEntry[0]; // try { // // // // IPath contextPath = getWebContextRoot(javaProject); -// //entry =JavaCore.newLibraryEntry(contextPath.makeAbsolute(), null,null, new IAccessRule[0], new IClasspathAttribute[0], true); -// //entry =JavaCore.newLibraryEntry(contextPath.makeAbsolute(), null, null, new IAccessRule[0], new IClasspathAttribute[0], true); -// //entry =JavaCore.newSourceEntry(contextPath.makeAbsolute()); +// //entry =JavaScriptCore.newLibraryEntry(contextPath.makeAbsolute(), null,null, new IAccessRule[0], new IIncludePathAttribute[0], true); +// //entry =JavaScriptCore.newLibraryEntry(contextPath.makeAbsolute(), null, null, new IAccessRule[0], new IIncludePathAttribute[0], true); +// //entry =JavaScriptCore.newSourceEntry(contextPath.makeAbsolute()); // entry = new ClasspathEntry( // IPackageFragmentRoot.K_SOURCE, -// IClasspathEntry.CPE_SOURCE, +// IIncludePathEntry.CPE_SOURCE, // contextPath.makeAbsolute(), // ClasspathEntry.INCLUDE_ALL, ClasspathEntry.EXCLUDE_NONE, // null, // source attachment @@ -161,23 +161,23 @@ // false, // null, // false, // no access rules to combine -// new IClasspathAttribute[] {ClasspathEntry.EXCLUDE_VALIDATE}); +// new IIncludePathAttribute[] {ClasspathEntry.EXCLUDE_VALIDATE}); // // } catch (RuntimeException ex) { // // TODO Auto-generated catch block // ex.printStackTrace(); // } // -// if(entry!=null) return new IClasspathEntry[] {entry}; -// return new IClasspathEntry[0]; +// if(entry!=null) return new IIncludePathEntry[] {entry}; +// return new IIncludePathEntry[0]; } - public void initialize(IPath containerPath, IJavaProject project) throws CoreException { + public void initialize(IPath containerPath, IJavaScriptProject project) throws CoreException { //this.javaProject = project; super.initialize(containerPath, project); } - public static IPath getWebContextRoot(IJavaProject javaProject) { + public static IPath getWebContextRoot(IJavaScriptProject javaProject) { String webRoot = WebRootFinder.getWebContentFolder(javaProject.getProject()).toString(); IPath webRootPath = javaProject.getPath().append(webRoot); return webRootPath; @@ -194,7 +194,7 @@ // { // IPath path = proxy.requestResource().getLocation(); // found.add(path); -// //IClasspathEntry newLibraryEntry = JavaCore.newLibraryEntry( path,null, null, new IAccessRule[ 0 ], new IClasspathAttribute[ 0 ], true ); +// //IIncludePathEntry newLibraryEntry = JavaScriptCore.newLibraryEntry( path,null, null, new IAccessRule[ 0 ], new IIncludePathAttribute[ 0 ], true ); // //entries.add( newLibraryEntry ); // return false; // }
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 9c3b86e..ec5f9ee 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
@@ -40,11 +40,11 @@ import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.jsdt.core.IClasspathAttribute; -import org.eclipse.wst.jsdt.core.IClasspathEntry; -import org.eclipse.wst.jsdt.core.IJavaProject; -import org.eclipse.wst.jsdt.core.JavaCore; -import org.eclipse.wst.jsdt.core.JavaModelException; +import org.eclipse.wst.jsdt.core.IIncludePathAttribute; +import org.eclipse.wst.jsdt.core.IIncludePathEntry; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; +import org.eclipse.wst.jsdt.core.JavaScriptCore; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; import org.eclipse.wst.jsdt.web.core.internal.JsCoreMessages; import org.eclipse.wst.jsdt.web.core.internal.Logger; import org.eclipse.wst.sse.core.StructuredModelManager; @@ -81,7 +81,7 @@ //try { if (project.isOpen()) { try { - if (project.hasNature(JavaCore.NATURE_ID)) { + if (project.hasNature(JavaScriptCore.NATURE_ID)) { WorkbenchReporter.removeAllMessages(project, rhinoValidator, null); } } catch (CoreException e) { @@ -224,20 +224,20 @@ if(excludeLibPaths!=null) return excludeLibPaths; IProject project = file.getProject(); - IJavaProject javaProject= JavaCore.create(project); + IJavaScriptProject javaProject= JavaScriptCore.create(project); if(javaProject==null) return new IPath[0]; - IClasspathEntry[] entries = new IClasspathEntry[0]; + IIncludePathEntry[] entries = new IIncludePathEntry[0]; try { entries = javaProject.getResolvedClasspath(true); - } catch (JavaModelException ex) { + } catch (JavaScriptModelException ex) { // May run into an exception if the project isn't jsdt. } ArrayList ignorePaths = new ArrayList(); nextEntry: for(int i = 0;i<entries.length;i++) { - if(entries[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) { - IClasspathAttribute[] attribs = entries[i].getExtraAttributes(); + if(entries[i].getEntryKind() == IIncludePathEntry.CPE_LIBRARY) { + IIncludePathAttribute[] attribs = entries[i].getExtraAttributes(); for(int k=0; attribs!=null && k<attribs.length;k++) { if(attribs[k].getName().equalsIgnoreCase("validate") && attribs[k].getValue().equalsIgnoreCase("false")) { //$NON-NLS-1$ //$NON-NLS-2$ ignorePaths.add(entries[i].getPath()); @@ -417,7 +417,7 @@ } }; try { - JavaCore.run(validationRunnable, rule, new NullProgressMonitor()); + JavaScriptCore.run(validationRunnable, rule, new NullProgressMonitor()); } catch (CoreException e) { if (e.getCause() instanceof ValidationException) { throw (ValidationException) e.getCause();
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslation.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslation.java index faec080..af97864 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslation.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslation.java
@@ -23,9 +23,9 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Position; -import org.eclipse.wst.jsdt.core.ICompilationUnit; -import org.eclipse.wst.jsdt.core.IJavaElement; -import org.eclipse.wst.jsdt.core.IJavaProject; +import org.eclipse.wst.jsdt.core.IJavaScriptUnit; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; @@ -36,21 +36,21 @@ */ public interface IJsTranslation { - public IJavaProject getJavaProject(); + public IJavaScriptProject getJavaProject(); public IDocument getHtmlDocument(); public int getMissingTagStart(); - public IJavaElement[] getAllElementsInJsRange(int javaPositionStart, int javaPositionEnd); + public IJavaScriptElement[] getAllElementsInJsRange(int javaPositionStart, int javaPositionEnd); - public ICompilationUnit getCompilationUnit(); + public IJavaScriptUnit getCompilationUnit(); - public IJavaElement[] getElementsFromJsRange(int javaPositionStart, int javaPositionEnd); + public IJavaScriptElement[] getElementsFromJsRange(int javaPositionStart, int javaPositionEnd); public String getHtmlText(); - public IJavaElement getJsElementAtOffset(int jsOffset); + public IJavaScriptElement getJsElementAtOffset(int jsOffset); public String getJsText(); @@ -74,7 +74,7 @@ public String getJavaPath(); - public IJsTranslation getInstance(IStructuredDocument htmlDocument, IJavaProject javaProj, boolean listenForChanges) ; + public IJsTranslation getInstance(IStructuredDocument htmlDocument, IJavaScriptProject javaProj, boolean listenForChanges) ; public void classpathChange() ; } \ No newline at end of file
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 2bedd64..afe59c7 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
@@ -40,12 +40,12 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Position; import org.eclipse.wst.jsdt.core.IBuffer; -import org.eclipse.wst.jsdt.core.ICompilationUnit; -import org.eclipse.wst.jsdt.core.IJavaElement; -import org.eclipse.wst.jsdt.core.IJavaProject; +import org.eclipse.wst.jsdt.core.IJavaScriptUnit; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; import org.eclipse.wst.jsdt.core.IPackageFragmentRoot; import org.eclipse.wst.jsdt.core.ISourceRange; -import org.eclipse.wst.jsdt.core.JavaModelException; // import +import org.eclipse.wst.jsdt.core.JavaScriptModelException; // import // org.eclipse.wst.jsdt.core.LibrarySuperType; import org.eclipse.wst.jsdt.core.WorkingCopyOwner; import org.eclipse.wst.jsdt.internal.core.DocumentContextFragmentRoot; @@ -67,9 +67,9 @@ DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$ } - private ICompilationUnit fCompilationUnit = null; + private IJavaScriptUnit fCompilationUnit = null; private DocumentContextFragmentRoot fDocumentScope; - private IJavaProject fJavaProject = null; + private IJavaScriptProject fJavaProject = null; private byte[] fLock = null; private IProgressMonitor fProgressMonitor = null; protected IStructuredDocument fHtmlDocument; @@ -99,7 +99,7 @@ - protected JsTranslation(IStructuredDocument htmlDocument, IJavaProject javaProj, boolean listenForChanges) { + protected JsTranslation(IStructuredDocument htmlDocument, IJavaScriptProject javaProj, boolean listenForChanges) { fLock = new byte[0]; fJavaProject = javaProj; fHtmlDocument = htmlDocument; @@ -108,14 +108,14 @@ this.listenForChanges=listenForChanges; } - public IJsTranslation getInstance(IStructuredDocument htmlDocument, IJavaProject javaProj, boolean listenForChanges) { + public IJsTranslation getInstance(IStructuredDocument htmlDocument, IJavaScriptProject javaProj, boolean listenForChanges) { return new JsTranslation(htmlDocument,javaProj, listenForChanges); } /* (non-Javadoc) * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getJavaProject() */ - public IJavaProject getJavaProject() { + public IJavaScriptProject getJavaProject() { return fJavaProject; } @@ -183,19 +183,19 @@ } /** - * Originally from ReconcileStepForJava. Creates an ICompilationUnit from + * Originally from ReconcileStepForJava. Creates an IJavaScriptUnit from * the contents of the JSP document. * - * @return an ICompilationUnit from the contents of the JSP document + * @return an IJavaScriptUnit from the contents of the JSP document */ - private ICompilationUnit createCompilationUnit() throws JavaModelException { + private IJavaScriptUnit createCompilationUnit() throws JavaScriptModelException { IPackageFragmentRoot root = getDocScope(true); - ICompilationUnit cu = root.getPackageFragment("").getCompilationUnit(getMangledName() + JsDataTypes.BASE_FILE_EXTENSION).getWorkingCopy(getWorkingCopyOwner(), getProblemRequestor(), getProgressMonitor()); //$NON-NLS-1$ + IJavaScriptUnit cu = root.getPackageFragment("").getCompilationUnit(getMangledName() + JsDataTypes.BASE_FILE_EXTENSION).getWorkingCopy(getWorkingCopyOwner(), getProblemRequestor(), getProgressMonitor()); //$NON-NLS-1$ IBuffer buffer; try { buffer = cu.getBuffer(); } - catch (JavaModelException e) { + catch (JavaScriptModelException e) { e.printStackTrace(); buffer = null; } @@ -215,29 +215,29 @@ /* (non-Javadoc) * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getAllElementsInJsRange(int, int) */ - public IJavaElement[] getAllElementsInJsRange(int javaPositionStart, int javaPositionEnd) { - IJavaElement[] EMTPY_RESULT_SET = new IJavaElement[0]; - IJavaElement[] result = EMTPY_RESULT_SET; - IJavaElement[] allChildren = null; + public IJavaScriptElement[] getAllElementsInJsRange(int javaPositionStart, int javaPositionEnd) { + IJavaScriptElement[] EMTPY_RESULT_SET = new IJavaScriptElement[0]; + IJavaScriptElement[] result = EMTPY_RESULT_SET; + IJavaScriptElement[] allChildren = null; try { allChildren = getCompilationUnit().getChildren(); } - catch (JavaModelException e) { + catch (JavaScriptModelException e) { } Vector validChildren = new Vector(); for (int i = 0; i < allChildren.length; i++) { - if (allChildren[i].getElementType() != IJavaElement.PACKAGE_DECLARATION) { + 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() == IJavaElement.TYPE) { + else if (allChildren[i].getElementType() == IJavaScriptElement.TYPE) { validChildren.add(allChildren[i]); } } } if (validChildren.size() > 0) { - result = (IJavaElement[]) validChildren.toArray(new IJavaElement[]{}); + result = (IJavaScriptElement[]) validChildren.toArray(new IJavaScriptElement[]{}); } if (result == null || result.length == 0) { return EMTPY_RESULT_SET; @@ -248,7 +248,7 @@ /* (non-Javadoc) * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getCompilationUnit() */ - public ICompilationUnit getCompilationUnit() { + public IJavaScriptUnit getCompilationUnit() { synchronized (fLock) { try { if (fCompilationUnit == null) { @@ -257,7 +257,7 @@ } } - catch (JavaModelException jme) { + catch (JavaScriptModelException jme) { if (JsTranslation.DEBUG) { Logger.logException("error creating JSP working copy... ", jme); //$NON-NLS-1$ } @@ -269,7 +269,7 @@ fCompilationUnit = fCompilationUnit.getWorkingCopy(getWorkingCopyOwner(), getProblemRequestor(), getProgressMonitor()); // fCompilationUnit.makeConsistent(getProgressMonitor()); } - catch (JavaModelException ex) { + catch (JavaScriptModelException ex) { // TODO Auto-generated catch block ex.printStackTrace(); } @@ -279,11 +279,11 @@ /* (non-Javadoc) * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getElementsFromJsRange(int, int) */ - public IJavaElement[] getElementsFromJsRange(int javaPositionStart, int javaPositionEnd) { - IJavaElement[] EMTPY_RESULT_SET = new IJavaElement[0]; - IJavaElement[] result = EMTPY_RESULT_SET; + public IJavaScriptElement[] getElementsFromJsRange(int javaPositionStart, int javaPositionEnd) { + IJavaScriptElement[] EMTPY_RESULT_SET = new IJavaScriptElement[0]; + IJavaScriptElement[] result = EMTPY_RESULT_SET; try { - ICompilationUnit cu = getCompilationUnit(); + IJavaScriptUnit cu = getCompilationUnit(); if (cu != null) { synchronized (fLock) { int cuDocLength = cu.getBuffer().getLength(); @@ -297,7 +297,7 @@ return EMTPY_RESULT_SET; } } - catch (JavaModelException x) { + catch (JavaScriptModelException x) { Logger.logException(x); } return result; @@ -325,12 +325,12 @@ /* (non-Javadoc) * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getJsElementAtOffset(int) */ - public IJavaElement getJsElementAtOffset(int jsOffset) { - IJavaElement elements = null; + public IJavaScriptElement getJsElementAtOffset(int jsOffset) { + IJavaScriptElement elements = null; try { elements = getCompilationUnit().getElementAt(jsOffset); } - catch (JavaModelException e) { + catch (JavaScriptModelException e) { // TODO Auto-generated catch block if (JsTranslation.DEBUG) { Logger.logException("error retrieving java elemtnt from compilation unit... ", e); //$NON-NLS-1$ @@ -340,14 +340,14 @@ return elements; } - private ISourceRange getJSSourceRangeOf(IJavaElement element) { + private ISourceRange getJSSourceRangeOf(IJavaScriptElement element) { // returns the offset in html of given element ISourceRange range = null; if (element instanceof SourceRefElement) { try { range = ((SourceRefElement) element).getSourceRange(); } - catch (JavaModelException e) { + catch (JavaScriptModelException e) { e.printStackTrace(); } } @@ -449,7 +449,7 @@ /** * - * @return the problem requestor for the CompilationUnit in this + * @return the problem requestor for the JavaScriptUnit in this * JSPTranslation */ private JsProblemRequestor getProblemRequestor() { @@ -494,7 +494,7 @@ */ public void reconcileCompilationUnit() { // if(true) return; - ICompilationUnit cu = getCompilationUnit(); + IJavaScriptUnit cu = getCompilationUnit(); if (fCompilationUnit == null) { return; } @@ -503,10 +503,10 @@ synchronized (fLock) { // if(false) // cu.makeConsistent(getProgressMonitor()); - cu.reconcile(ICompilationUnit.NO_AST, true, getWorkingCopyOwner(), getProgressMonitor()); + cu.reconcile(IJavaScriptUnit.NO_AST, true, getWorkingCopyOwner(), getProgressMonitor()); } } - catch (JavaModelException e) { + catch (JavaScriptModelException e) { Logger.logException(e); } } @@ -524,12 +524,12 @@ try { if (JsTranslation.DEBUG) { System.out.println("------------------------------------------------------------------"); //$NON-NLS-1$ - System.out.println("(-) JSPTranslation [" + this + "] discarding CompilationUnit: " + fCompilationUnit); //$NON-NLS-1$ //$NON-NLS-2$ + System.out.println("(-) JSPTranslation [" + this + "] discarding JavaScriptUnit: " + fCompilationUnit); //$NON-NLS-1$ //$NON-NLS-2$ System.out.println("------------------------------------------------------------------"); //$NON-NLS-1$ } fCompilationUnit.discardWorkingCopy(); } - catch (JavaModelException e) { + catch (JavaScriptModelException e) { // we're done w/ it anyway } } @@ -540,7 +540,7 @@ * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#setProblemCollectingActive(boolean) */ public void setProblemCollectingActive(boolean collect) { - ICompilationUnit cu = getCompilationUnit(); + IJavaScriptUnit cu = getCompilationUnit(); if (cu != null) { getProblemRequestor().setIsActive(collect); }
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapter.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapter.java index d8082a5..b934314 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapter.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapter.java
@@ -30,8 +30,8 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.jsdt.core.IJavaProject; -import org.eclipse.wst.jsdt.core.JavaCore; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; +import org.eclipse.wst.jsdt.core.JavaScriptCore; import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; @@ -67,8 +67,8 @@ } } - public IJavaProject getJavaProject() { - IJavaProject javaProject = null; + public IJavaScriptProject getJavaProject() { + IJavaScriptProject javaProject = null; IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); IPath filePath = new Path(baseLocation); IProject project = null; @@ -76,7 +76,7 @@ project = root.getProject(filePath.segment(0)); } if (project != null) { - javaProject = JavaCore.create(project); + javaProject = JavaScriptCore.create(project); } return javaProject; @@ -125,7 +125,7 @@ private void initializeJavaPlugins() { - JavaCore.getPlugin(); + JavaScriptCore.getPlugin(); } public boolean isAdapterForType(Object type) {
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JSDTSearchDocumentDelegate.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JSDTSearchDocumentDelegate.java index f83a6b0..6ffb522 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JSDTSearchDocumentDelegate.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JSDTSearchDocumentDelegate.java
@@ -11,7 +11,7 @@ package org.eclipse.wst.jsdt.web.core.javascript.search; import org.eclipse.core.resources.IFile; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.internal.core.search.JavaSearchDocument; import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation; @@ -69,7 +69,7 @@ public void release() { this.fJSPSearchDoc.release(); } - public IJavaElement getJavaElement() { + public IJavaScriptElement getJavaElement() { return getJspTranslation().getCompilationUnit(); } public boolean isVirtual() {
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsIndexManager.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsIndexManager.java index d80906d..7c85bb9 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsIndexManager.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsIndexManager.java
@@ -35,8 +35,8 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.jsdt.core.IJavaProject; -import org.eclipse.wst.jsdt.core.JavaCore; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; +import org.eclipse.wst.jsdt.core.JavaScriptCore; import org.eclipse.wst.jsdt.internal.core.JavaModelManager; import org.eclipse.wst.jsdt.internal.core.index.Index; import org.eclipse.wst.jsdt.internal.core.search.indexing.IndexManager; @@ -265,7 +265,7 @@ } IFile file = filesToBeProcessed[lastFileCursor]; try { - IJavaProject project = JavaCore.create(file.getProject()); + IJavaScriptProject project = JavaScriptCore.create(file.getProject()); if (project.exists()) { ss.addJspFile(file); // JSP Indexer processing n files
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsPathIndexer.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsPathIndexer.java index ec60631..beeb033 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsPathIndexer.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsPathIndexer.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.jsdt.core.search.IJavaSearchScope; +import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope; import org.eclipse.wst.jsdt.core.search.SearchPattern; import org.eclipse.wst.jsdt.web.core.internal.validation.Util; @@ -46,10 +46,10 @@ class JSPFileVisitor implements IResourceProxyVisitor { // hash map forces only one of each file private HashMap fPaths = new HashMap(); - IJavaSearchScope fScope = null; + IJavaScriptSearchScope fScope = null; SearchPattern fPattern = null; - public JSPFileVisitor(SearchPattern pattern, IJavaSearchScope scope) { + public JSPFileVisitor(SearchPattern pattern, IJavaScriptSearchScope scope) { this.fPattern = pattern; this.fScope = scope; } @@ -97,7 +97,7 @@ } } - public IPath[] getVisibleJspPaths(SearchPattern pattern, IJavaSearchScope scope) { + public IPath[] getVisibleJspPaths(SearchPattern pattern, IJavaScriptSearchScope scope) { JSPFileVisitor jspFileVisitor = new JSPFileVisitor(pattern, scope); try {
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchParticipant.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchParticipant.java index ef5cc74..7fe7a7d 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchParticipant.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchParticipant.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.jsdt.core.search.IJavaSearchScope; +import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope; import org.eclipse.wst.jsdt.core.search.SearchDocument; import org.eclipse.wst.jsdt.core.search.SearchEngine; import org.eclipse.wst.jsdt.core.search.SearchParticipant; @@ -59,7 +59,7 @@ return "Embeded JavaScript"; //$NON-NLS-1$ } - public IPath[] selectIndexes(SearchPattern pattern, IJavaSearchScope scope) { + public IPath[] selectIndexes(SearchPattern pattern, IJavaScriptSearchScope scope) { JsPathIndexer indexer = new JsPathIndexer(); return indexer.getVisibleJspPaths(pattern, scope); } @@ -73,7 +73,7 @@ SearchEngine.getDefaultSearchParticipant().indexDocument(document, indexPath); } - public void locateMatches(SearchDocument[] indexMatches, SearchPattern pattern, IJavaSearchScope scope, SearchRequestor requestor, IProgressMonitor monitor) throws CoreException { + public void locateMatches(SearchDocument[] indexMatches, SearchPattern pattern, IJavaScriptSearchScope scope, SearchRequestor requestor, IProgressMonitor monitor) throws CoreException { if ((monitor != null) && monitor.isCanceled()) { return;
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchScope.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchScope.java index c81d272..d87bd99 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchScope.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchScope.java
@@ -16,14 +16,14 @@ import org.eclipse.core.resources.IResourceProxy; import org.eclipse.core.runtime.IPath; -import org.eclipse.wst.jsdt.core.IJavaElement; -import org.eclipse.wst.jsdt.core.search.IJavaSearchScope; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; +import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope; /** * Used to constrain JSP/java search to certain paths and elements. * @author pavery */ -public class JsSearchScope implements IJavaSearchScope { +public class JsSearchScope implements IJavaScriptSearchScope { private boolean fEnclosesAll = false; private List fResourcePaths = null; @@ -41,7 +41,7 @@ fResourcePaths.addAll(Arrays.asList(resourceStringPath)); } - public JsSearchScope(IJavaElement[] javaElement) { + public JsSearchScope(IJavaScriptElement[] javaElement) { init(); fJavaElements.addAll(Arrays.asList(javaElement)); } @@ -62,7 +62,7 @@ return false; } - public boolean encloses(IJavaElement element) { + public boolean encloses(IJavaScriptElement element) { // pa_TOD implement if (this.fEnclosesAll) { @@ -87,7 +87,7 @@ this.fResourcePaths.add(path); } - public void addElement(IJavaElement element) { + public void addElement(IJavaScriptElement element) { this.fJavaElements.add(element); }
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchSupport.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchSupport.java index ef19982..453f1f9 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchSupport.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchSupport.java
@@ -26,9 +26,9 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.wst.jsdt.core.IJavaElement; -import org.eclipse.wst.jsdt.core.search.IJavaSearchConstants; -import org.eclipse.wst.jsdt.core.search.IJavaSearchScope; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; +import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchConstants; +import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope; import org.eclipse.wst.jsdt.core.search.SearchDocument; import org.eclipse.wst.jsdt.core.search.SearchEngine; import org.eclipse.wst.jsdt.core.search.SearchPattern; @@ -79,11 +79,11 @@ * This operation ensures that the live resource's search markers show up in * the open editor. It also allows the ability to pass in a ProgressMonitor */ - private class SearchJob extends Job implements IJavaSearchConstants { + private class SearchJob extends Job implements IJavaScriptSearchConstants { String fSearchText = ""; //$NON-NLS-1$ - IJavaSearchScope fScope = null; + IJavaScriptSearchScope fScope = null; int fSearchFor = FIELD; @@ -95,10 +95,10 @@ SearchRequestor fRequestor = null; - IJavaElement fElement = null; + IJavaScriptElement fElement = null; // constructor w/ java element - public SearchJob(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) { + public SearchJob(IJavaScriptElement element, IJavaScriptSearchScope scope, SearchRequestor requestor) { super(JsCoreMessages.JSP_Search + element.getElementName()); this.fElement = element; @@ -107,7 +107,7 @@ } // constructor w/ search text - public SearchJob(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) { + public SearchJob(String searchText, IJavaScriptSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) { super(JsCoreMessages.JSP_Search + searchText); this.fSearchText = searchText; @@ -170,11 +170,11 @@ /** * Runnable forces caller to wait until finished (as opposed to using a Job) */ - private class SearchRunnable implements IWorkspaceRunnable, IJavaSearchConstants { + private class SearchRunnable implements IWorkspaceRunnable, IJavaScriptSearchConstants { String fSearchText = ""; //$NON-NLS-1$ - IJavaSearchScope fScope = null; + IJavaScriptSearchScope fScope = null; int fSearchFor = FIELD; @@ -186,10 +186,10 @@ SearchRequestor fRequestor = null; - IJavaElement fElement = null; + IJavaScriptElement fElement = null; // constructor w/ java element - public SearchRunnable(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) { + public SearchRunnable(IJavaScriptElement element, IJavaScriptSearchScope scope, SearchRequestor requestor) { this.fElement = element; this.fScope = scope; @@ -197,7 +197,7 @@ } // constructor w/ search text - public SearchRunnable(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) { + public SearchRunnable(String searchText, IJavaScriptSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) { this.fSearchText = searchText; this.fScope = scope; @@ -338,12 +338,12 @@ * @param searchText * the string of text to search on * @param searchFor - * IJavaSearchConstants.TYPE, METHOD, FIELD, PACKAGE, etc... + * IJavaScriptSearchConstants.TYPE, METHOD, FIELD, PACKAGE, etc... * @param limitTo - * IJavaSearchConstants.DECLARATIONS, - * IJavaSearchConstants.REFERENCES, - * IJavaSearchConstants.IMPLEMENTORS, or - * IJavaSearchConstants.ALL_OCCURRENCES + * IJavaScriptSearchConstants.DECLARATIONS, + * IJavaScriptSearchConstants.REFERENCES, + * IJavaScriptSearchConstants.IMPLEMENTORS, or + * IJavaScriptSearchConstants.ALL_OCCURRENCES * @param matchMode * allow * wildcards or not * @param isCaseSensitive @@ -351,7 +351,7 @@ * passed in to accept search matches (and do "something" with * them) */ - public void search(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) { + public void search(String searchText, IJavaScriptSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) { JsIndexManager.getInstance().rebuildIndexIfNeeded(); @@ -366,14 +366,14 @@ } /** - * Search for an IJavaElement, constrained by the given parameters. Runs in + * Search for an IJavaScriptElement, constrained by the given parameters. Runs in * a background Job (results may still come in after this method call) * * @param element * @param scope * @param requestor */ - public void search(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) { + public void search(IJavaScriptElement element, IJavaScriptSearchScope scope, SearchRequestor requestor) { JsIndexManager.getInstance().rebuildIndexIfNeeded(); @@ -386,7 +386,7 @@ } /** - * Search for an IJavaElement, constrained by the given parameters. Runs in + * Search for an IJavaScriptElement, constrained by the given parameters. Runs in * an IWorkspace runnable (results will be reported by the end of this * method) * @@ -394,7 +394,7 @@ * @param scope * @param requestor */ - public void searchRunnable(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) { + public void searchRunnable(IJavaScriptElement element, IJavaScriptSearchScope scope, SearchRequestor requestor) { JsIndexManager.getInstance().rebuildIndexIfNeeded();
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml index d44e576..0fa8c67 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml +++ b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
@@ -665,7 +665,7 @@ </iterate> </with> <with variable="element"> - <instanceof value="org.eclipse.wst.jsdt.core.IMethod" /> + <instanceof value="org.eclipse.wst.jsdt.core.IFunction" /> </with> </enablement>
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/SetupProjectsWizzard.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/SetupProjectsWizzard.java index a92cc20..6531dfb 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/SetupProjectsWizzard.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/SetupProjectsWizzard.java
@@ -11,9 +11,9 @@ import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.wst.jsdt.core.IClasspathEntry; -import org.eclipse.wst.jsdt.core.JavaCore; -import org.eclipse.wst.jsdt.core.JavaModelException; +import org.eclipse.wst.jsdt.core.IIncludePathEntry; +import org.eclipse.wst.jsdt.core.JavaScriptCore; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; import org.eclipse.wst.jsdt.internal.core.JavaProject; import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature; @@ -46,11 +46,11 @@ ex.printStackTrace(); } }else { - JavaProject jp = (JavaProject)JavaCore.create(project); - IClasspathEntry[] rawClasspath = null; + JavaProject jp = (JavaProject)JavaScriptCore.create(project); + IIncludePathEntry[] rawClasspath = null; try { rawClasspath = jp.getRawClasspath(); - } catch (JavaModelException ex1) { + } catch (JavaScriptModelException ex1) { // TODO Auto-generated catch block ex1.printStackTrace(); }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectJsGlobalScopeUIInitializer.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectJsGlobalScopeUIInitializer.java index f0eb5a5..7739f1e 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectJsGlobalScopeUIInitializer.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectJsGlobalScopeUIInitializer.java
@@ -5,7 +5,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.wst.jsdt.core.IJavaProject; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; import org.eclipse.wst.jsdt.internal.ui.IJsGlobalScopeContainerInitializerExtension; /** @@ -14,9 +14,9 @@ */ public class WebProjectJsGlobalScopeUIInitializer implements IJsGlobalScopeContainerInitializerExtension{ /* (non-Javadoc) - * @see org.eclipse.wst.jsdt.internal.ui.IJsGlobalScopeContainerInitialzerExtension#getImage(org.eclipse.core.runtime.IPath, java.lang.String, org.eclipse.wst.jsdt.core.IJavaProject) + * @see org.eclipse.wst.jsdt.internal.ui.IJsGlobalScopeContainerInitialzerExtension#getImage(org.eclipse.core.runtime.IPath, java.lang.String, org.eclipse.wst.jsdt.core.IJavaScriptProject) */ - public ImageDescriptor getImage(IPath containerPath, String element, IJavaProject project) { + public ImageDescriptor getImage(IPath containerPath, String element, IJavaScriptProject project) { return ImageDescriptor.createFromFile(this.getClass(),"web1.JPG"); //$NON-NLS-1$ } }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java index 4973731..14271b8 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java
@@ -13,8 +13,8 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.jsdt.core.ICompilationUnit; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptUnit; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.core.IMember; import org.eclipse.wst.jsdt.internal.ui.actions.WorkbenchRunnableAdapter; import org.eclipse.wst.jsdt.internal.ui.util.ExceptionHandler; @@ -41,13 +41,13 @@ } public void run(IAction action) { - IJavaElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection); + IJavaScriptElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection); if (elements == null || elements.length < 1) { return; } - IJavaElement parent = elements[0].getParent(); + IJavaScriptElement parent = elements[0].getParent(); /* find the cu */ - while (parent != null && !(parent instanceof ICompilationUnit)) { + while (parent != null && !(parent instanceof IJavaScriptUnit)) { } if (parent != null) { @@ -59,11 +59,11 @@ } JsJfaceNode node[] = SimpleJSDTActionProxy.getJsJfaceNodesFromSelection(selection); /* only should be one node */ - run((ICompilationUnit) parent, (IMember[]) members.toArray(new IMember[members.size()]), node[0]); + run((IJavaScriptUnit) parent, (IMember[]) members.toArray(new IMember[members.size()]), node[0]); } } - public void run(ICompilationUnit cu, IMember[] members, JsJfaceNode node) { + public void run(IJavaScriptUnit cu, IMember[] members, JsJfaceNode node) { try { AddJavaDocStubOperation op = new AddJavaDocStubOperation(members, node); PlatformUI.getWorkbench().getProgressService().runInUI(PlatformUI.getWorkbench().getProgressService(), new WorkbenchRunnableAdapter(op, op.getScheduleRule()), op.getScheduleRule());
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java index 06df4ea..68f20fb 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java
@@ -11,7 +11,7 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.text.edits.MalformedTreeException; import org.eclipse.text.edits.MultiTextEdit; -import org.eclipse.wst.jsdt.core.ICompilationUnit; +import org.eclipse.wst.jsdt.core.IJavaScriptUnit; import org.eclipse.wst.jsdt.core.IMember; import org.eclipse.wst.jsdt.web.core.javascript.DocumentChangeListenerToTextEdit; import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation; @@ -67,11 +67,11 @@ /* * (non-Javadoc) * - * @see org.eclipse.wst.jsdt.internal.corext.codemanipulation.AddJavaDocStubOperation#getDocument(org.eclipse.wst.jsdt.core.ICompilationUnit, + * @see org.eclipse.wst.jsdt.internal.corext.codemanipulation.AddJavaDocStubOperation#getDocument(org.eclipse.wst.jsdt.core.IJavaScriptUnit, * org.eclipse.core.runtime.IProgressMonitor) */ - protected IDocument getDocument(ICompilationUnit cu, IProgressMonitor monitor) throws CoreException { + protected IDocument getDocument(IJavaScriptUnit cu, IProgressMonitor monitor) throws CoreException { return getJavaDocumentFromNode(); }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java index d921f9b..dfab50e 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java
@@ -5,7 +5,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; /** * @author childsb @@ -19,7 +19,7 @@ */ public Object[] getRunArgs(IAction action) { - IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); + IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); if (elements != null && elements.length > 0) { return new Object[] { elements[0] }; } @@ -33,7 +33,7 @@ */ public Class[] getRunArgTypes() { - return new Class[] { IJavaElement.class }; + return new Class[] { IJavaScriptElement.class }; }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java index e80577a..f6c5f32 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java
@@ -6,7 +6,7 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.jface.action.IAction; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; /** * @author childsb @@ -17,11 +17,11 @@ public void run(IAction action) { try { Object handler = getActionHandler(action); - IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); + IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); if (elements == null || elements.length == 0) { return; } - SimpleJSDTActionProxy.executeMethod(handler, "run", new Class[] { IJavaElement.class }, new Object[] { elements[0] }); //$NON-NLS-1$ + SimpleJSDTActionProxy.executeMethod(handler, "run", new Class[] { IJavaScriptElement.class }, new Object[] { elements[0] }); //$NON-NLS-1$ } catch (IllegalArgumentException ex) { // TODO Auto-generated catch block ex.printStackTrace();
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java index 95ada0e..28ea9f6 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java
@@ -9,7 +9,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode; /** @@ -18,32 +18,32 @@ */ public class JsElementActionProxy extends SimpleJSDTActionProxy { /* Util method to get all the java elements in a selection */ - public static IJavaElement[] getJsElementsFromSelection(ISelection selection) { + public static IJavaScriptElement[] getJsElementsFromSelection(ISelection selection) { if (selection == null) { - return new IJavaElement[0]; + return new IJavaScriptElement[0]; } ArrayList elements = new ArrayList(); if (selection instanceof IStructuredSelection) { Iterator itt = ((IStructuredSelection) selection).iterator(); while (itt.hasNext()) { Object element = itt.next(); - if (element instanceof IJavaElement) { + if (element instanceof IJavaScriptElement) { elements.add(element); } if (element instanceof IJavaWebNode) { elements.add(((IJavaWebNode) element).getJavaElement()); } } - return (IJavaElement[]) elements.toArray(new IJavaElement[elements.size()]); + return (IJavaScriptElement[]) elements.toArray(new IJavaScriptElement[elements.size()]); } - return new IJavaElement[0]; + return new IJavaScriptElement[0]; } public Object[] getRunArgs(IAction action) { /* * Needs to return an array of IJavaElements. Since its one arg of type - * IJavaElement[] need to put into an object array + * IJavaScriptElement[] need to put into an object array */ return new Object[] { JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()) }; } @@ -55,6 +55,6 @@ */ public Class[] getRunArgTypes() { - return new Class[] { (new IJavaElement[0]).getClass() }; + return new Class[] { (new IJavaScriptElement[0]).getClass() }; } }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java index 560e6a3..4f1a99d 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java
@@ -5,7 +5,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; /** * @author childsb @@ -20,10 +20,10 @@ */ public void selectionChanged(IAction action, ISelection selection) { - IJavaElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection); + IJavaScriptElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection); /* Open call hierarchy needs to be disabled for TYPEs */ for (int i = 0; i < elements.length; i++) { - if (elements[i].getElementType() == IJavaElement.TYPE) { + if (elements[i].getElementType() == IJavaScriptElement.TYPE) { action.setEnabled(false); return; }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java index cd85638..9c39400 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java
@@ -5,7 +5,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; /** * @author childsb @@ -14,10 +14,10 @@ public class OpenTypeHierarchy extends JsElementActionProxy { public void selectionChanged(IAction action, ISelection selection) { - IJavaElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection); + IJavaScriptElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection); /* Open call hierarchy needs to be disabled for TYPEs */ for (int i = 0; i < elements.length; i++) { - if (elements[i].getElementType() != IJavaElement.TYPE) { + if (elements[i].getElementType() != IJavaScriptElement.TYPE) { action.setEnabled(false); return; }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java index deb2a67..edad732 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java
@@ -15,7 +15,7 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.ISetSelectionTarget; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.internal.ui.util.ExceptionHandler; /** @@ -28,7 +28,7 @@ * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ - private IResource getHostResource(IJavaElement virtualElement) { + private IResource getHostResource(IJavaScriptElement virtualElement) { IProject project = virtualElement.getJavaProject().getProject(); IPath path = new Path(virtualElement.getHostPath().getPath()); IResource host = project.getWorkspace().getRoot().findMember(path); @@ -37,7 +37,7 @@ public void run(IAction action) { - IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); + IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); if (elements == null || elements.length == 0) { return; } @@ -65,7 +65,7 @@ public void selectionChanged(IAction action, ISelection selection) { setSelection(selection); - IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); + IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); for (int i = 0; i < elements.length; i++) { if (elements[i].isVirtual()) { IResource resource = getHostResource(elements[i]);
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java index bd1a2c7..c8acfa4 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java
@@ -15,7 +15,7 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.ISetSelectionTarget; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.internal.ui.util.ExceptionHandler; /** @@ -28,7 +28,7 @@ * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ - private IResource getHostResource(IJavaElement virtualElement) { + private IResource getHostResource(IJavaScriptElement virtualElement) { IProject project = virtualElement.getJavaProject().getProject(); IPath path = new Path(virtualElement.getHostPath().getPath()); IResource host = project.getWorkspace().getRoot().findMember(path); @@ -37,7 +37,7 @@ public void run(IAction action) { - IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); + IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); if (elements == null || elements.length == 0) { return; } @@ -65,7 +65,7 @@ public void selectionChanged(IAction action, ISelection selection) { setSelection(selection); - IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); + IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); for (int i = 0; i < elements.length; i++) { if (elements[i].isVirtual()) { IResource resource = getHostResource(elements[i]);
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java index 0f44ff1..d4adbff 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java
@@ -11,7 +11,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.part.ISetSelectionTarget; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.internal.ui.packageview.PackageExplorerPart; /** @@ -24,7 +24,7 @@ * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ - private IResource getHostResource(IJavaElement virtualElement) { + private IResource getHostResource(IJavaScriptElement virtualElement) { IProject project = virtualElement.getJavaProject().getProject(); IPath path = new Path(virtualElement.getHostPath().getPath()); IResource host = project.getWorkspace().getRoot().findMember(path); @@ -38,7 +38,7 @@ */ public Object[] getRunArgs(IAction action) { - IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); + IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); if (elements != null && elements.length > 0) { return new Object[] { elements[0] }; } @@ -52,12 +52,12 @@ */ public Class[] getRunArgTypes() { - return new Class[] { IJavaElement.class }; + return new Class[] { IJavaScriptElement.class }; } public void run(IAction action) { - IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); + IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); if (elements == null || elements.length == 0) { return; } @@ -90,7 +90,7 @@ public void selectionChanged(IAction action, ISelection selection) { setSelection(selection); - IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); + IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()); for (int i = 0; i < elements.length; i++) { if (elements[i].isVirtual()) { IResource resource = getHostResource(elements[i]);
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java index d6fceeb..7e47009 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java
@@ -16,7 +16,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode; import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JsJfaceNode; import org.eclipse.wst.sse.core.StructuredModelManager; @@ -131,7 +131,7 @@ Iterator itt = ((IStructuredSelection) selection).iterator(); while (itt.hasNext()) { Object element = itt.next(); - if (element instanceof IJavaElement) { + if (element instanceof IJavaScriptElement) { elements.add(element); } if (element instanceof IJavaWebNode) {
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java index 70186b6..091082c 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java
@@ -9,8 +9,8 @@ import org.eclipse.jface.text.IAutoEditStrategy; import org.eclipse.jface.text.IDocument; import org.eclipse.wst.html.core.text.IHTMLPartitions; -import org.eclipse.wst.jsdt.core.IJavaProject; -import org.eclipse.wst.jsdt.core.JavaCore; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; +import org.eclipse.wst.jsdt.core.JavaScriptCore; import org.eclipse.wst.jsdt.internal.ui.text.java.JavaAutoIndentStrategy; import org.eclipse.wst.jsdt.internal.ui.text.java.SmartSemicolonAutoEditStrategy; import org.eclipse.wst.jsdt.internal.ui.text.javadoc.JavaDocAutoIndentStrategy; @@ -42,9 +42,9 @@ return fStrategies; } - private IJavaProject getJavaProject(IDocument document) { + private IJavaScriptProject getJavaProject(IDocument document) { IDOMModel model = null; - IJavaProject javaProject = null; + IJavaScriptProject javaProject = null; try { model = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(document); String baseLocation = model.getBaseLocation(); @@ -55,7 +55,7 @@ project = root.getProject(filePath.segment(0)); } if (project != null) { - javaProject = JavaCore.create(project); + javaProject = JavaScriptCore.create(project); } } finally { if (model != null) {
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 50e8e0b..ef185db 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
@@ -4,7 +4,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.wst.jsdt.core.ICompilationUnit; +import org.eclipse.wst.jsdt.core.IJavaScriptUnit; import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation; import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter; @@ -64,7 +64,7 @@ IJsTranslation translation = fTranslationAdapter.getJSPTranslation(true); fJavaPosition = getDocumentPosition(); try { - ICompilationUnit cu = translation.getCompilationUnit(); + IJavaScriptUnit cu = translation.getCompilationUnit(); // can't get java proposals w/out a compilation unit // or without a valid position if (cu == null || -1 == fJavaPosition) {
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 f524a5d..38f8cfc 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
@@ -61,7 +61,7 @@ public IDocument getDocument() { return viewer.getDocument(); } -// public ICompilationUnit getCompilationUnit() { +// public IJavaScriptUnit getCompilationUnit() { // return getJSPTranslation(viewer).getCompilationUnit(); // } }
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 fa82d6b..b01fa80 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
@@ -18,10 +18,10 @@ import org.eclipse.jface.text.formatter.FormattingContextProperties; import org.eclipse.jface.text.formatter.IFormattingContext; import org.eclipse.text.edits.TextEdit; -import org.eclipse.wst.jsdt.core.ICompilationUnit; -import org.eclipse.wst.jsdt.core.IJavaProject; -import org.eclipse.wst.jsdt.core.JavaCore; -import org.eclipse.wst.jsdt.core.JavaModelException; +import org.eclipse.wst.jsdt.core.IJavaScriptUnit; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; +import org.eclipse.wst.jsdt.core.JavaScriptCore; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; import org.eclipse.wst.jsdt.core.formatter.CodeFormatter; import org.eclipse.wst.jsdt.internal.corext.util.CodeFormatterUtil; import org.eclipse.wst.jsdt.internal.formatter.DefaultCodeFormatter; @@ -78,7 +78,7 @@ // JSPTranslationUtil translationUtil = new // JSPTranslationUtil(document); IJsTranslation translation = getTranslation(document); - ICompilationUnit cu = translation.getCompilationUnit(); + IJavaScriptUnit cu = translation.getCompilationUnit(); if (cu != null) { String cuSource = cu.getSource(); int javaStart = partition.getOffset(); @@ -100,7 +100,7 @@ // document.addDocumentPartitioningListener(new ModelIrritant(document)); } } catch (BadLocationException e) { - } catch (JavaModelException e) { + } catch (JavaScriptModelException e) { } } } @@ -138,7 +138,7 @@ } private Map getProjectOptions(IDocument baseDocument) { - IJavaProject javaProject = null; + IJavaScriptProject javaProject = null; IDOMModel xmlModel = null; Map options = null; try { @@ -151,7 +151,7 @@ project = root.getProject(filePath.segment(0)); } if (project != null) { - javaProject = JavaCore.create(project); + javaProject = JavaScriptCore.create(project); } } finally { if (xmlModel != null) {
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java index 90ca387..7b43074 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java
@@ -3,7 +3,7 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.ui.IEditorPart; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.ui.JavaUI; import org.eclipse.wst.jsdt.web.ui.internal.Logger; @@ -11,10 +11,10 @@ * Hyperlink for JSP Java elements */ class JSDTHyperlink implements IHyperlink { - private IJavaElement fElement; + private IJavaScriptElement fElement; private IRegion fRegion; - public JSDTHyperlink(IRegion region, IJavaElement element) { + public JSDTHyperlink(IRegion region, IJavaScriptElement element) { fRegion = region; fElement = element; }
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 50e64d6..01aee9c 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
@@ -15,14 +15,14 @@ import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.wst.jsdt.core.IClassFile; -import org.eclipse.wst.jsdt.core.ICompilationUnit; +import org.eclipse.wst.jsdt.core.IJavaScriptUnit; import org.eclipse.wst.jsdt.core.IField; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.core.ILocalVariable; -import org.eclipse.wst.jsdt.core.IMethod; +import org.eclipse.wst.jsdt.core.IFunction; import org.eclipse.wst.jsdt.core.ISourceRange; import org.eclipse.wst.jsdt.core.ISourceReference; -import org.eclipse.wst.jsdt.core.JavaModelException; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; import org.eclipse.wst.jsdt.internal.core.JavaElement; import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation; import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter; @@ -37,7 +37,7 @@ * Detects hyperlinks in JSP Java content */ public class JSDTHyperlinkDetector extends AbstractHyperlinkDetector { - private IHyperlink createHyperlink(IJavaElement element, IRegion region, IDocument document) { + private IHyperlink createHyperlink(IJavaScriptElement element, IRegion region, IDocument document) { IHyperlink link = null; if (region != null) { // open local variable in the JSP file... @@ -70,14 +70,14 @@ // link to local variable definitions if (element instanceof ILocalVariable) { range = ((ILocalVariable) element).getNameRange(); - IJavaElement unit=((ILocalVariable) element).getParent(); - ICompilationUnit myUnit = jspTranslation.getCompilationUnit(); + IJavaScriptElement unit=((ILocalVariable) element).getParent(); + IJavaScriptUnit myUnit = jspTranslation.getCompilationUnit(); - while(!(unit instanceof ICompilationUnit || unit instanceof IClassFile || unit==null)) { + while(!(unit instanceof IJavaScriptUnit || unit instanceof IClassFile || unit==null)) { unit = ((JavaElement) unit).getParent(); } - if(unit instanceof ICompilationUnit) { - ICompilationUnit cu = (ICompilationUnit)unit; + if(unit instanceof IJavaScriptUnit) { + IJavaScriptUnit cu = (IJavaScriptUnit)unit; if(cu!=myUnit) { file = getFile(cu.getPath().toString()); if(file==null) { @@ -96,15 +96,15 @@ } // linking to fields of the same compilation unit - else if (element.getElementType() == IJavaElement.FIELD) { + else if (element.getElementType() == IJavaScriptElement.FIELD) { Object cu = ((IField) element).getCompilationUnit(); if (cu != null && cu.equals(jspTranslation.getCompilationUnit())) { range = ((ISourceReference) element).getSourceRange(); } } // linking to methods of the same compilation unit - else if (element.getElementType() == IJavaElement.METHOD) { - Object cu = ((IMethod) element).getCompilationUnit(); + else if (element.getElementType() == IJavaScriptElement.METHOD) { + Object cu = ((IFunction) element).getCompilationUnit(); if (cu != null && cu.equals(jspTranslation.getCompilationUnit())) { range = ((ISourceReference) element).getSourceRange(); } @@ -121,7 +121,7 @@ link = new ExternalFileHyperlink(region,outsidePath.toFile()); } } - } catch (JavaModelException jme) { + } catch (JavaScriptModelException jme) { Logger.log(Logger.WARNING_DEBUG, jme.getMessage(), jme); } } @@ -149,11 +149,11 @@ // check that we are not in indirect Java content (like // included files) // get Java elements - IJavaElement[] elements = jspTranslation.getElementsFromJsRange(region.getOffset(), region.getOffset() + region.getLength()); + IJavaScriptElement[] elements = jspTranslation.getElementsFromJsRange(region.getOffset(), region.getOffset() + region.getLength()); if (elements != null && elements.length > 0) { // create a JSPJavaHyperlink for each Java element for (int i = 0; i < elements.length; ++i) { - IJavaElement element = elements[i]; + IJavaScriptElement element = elements[i]; // find hyperlink range for Java element IRegion hyperlinkRegion = selectWord(document, region.getOffset()); IHyperlink link = createHyperlink(element, hyperlinkRegion, document);
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java index b8afc1f..b9239cc 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java
@@ -42,7 +42,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.WorkspaceModifyOperation; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.core.search.SearchDocument; import org.eclipse.wst.jsdt.core.search.SearchMatch; import org.eclipse.wst.jsdt.core.search.SearchRequestor; @@ -54,7 +54,7 @@ import org.eclipse.wst.sse.core.internal.encoding.CodedStreamCreator; /** - * Creates document change(s) for an IJavaElement rename. Changes are created + * Creates document change(s) for an IJavaScriptElement rename. Changes are created * for every type "match" in the workspace * * @author pavery @@ -229,13 +229,13 @@ } // end inner class RenameChange /** The type being renamed (the old type) */ - IJavaElement fElement = null; + IJavaScriptElement fElement = null; /** The new name of the type being renamed */ private String fNewName = ""; //$NON-NLS-1$ /** maps a JSPSearchDocument path -> MultiTextEdit for the java file */ private HashMap fSearchDocPath2JavaEditMap = null; - public BasicRefactorSearchRequestor(IJavaElement element, String newName) { + public BasicRefactorSearchRequestor(IJavaScriptElement element, String newName) { this.fNewName = newName; this.fElement = element; this.fSearchDocPath2JavaEditMap = new HashMap(); @@ -322,7 +322,7 @@ return ""; //$NON-NLS-1$ } - public IJavaElement getElement() { + public IJavaScriptElement getElement() { return this.fElement; }
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 9e5a20b..9ae4d46 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
@@ -15,7 +15,7 @@ import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation; import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter; @@ -25,8 +25,8 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; class JSPJavaSelectionProvider { - static IJavaElement[] getSelection(ITextEditor textEditor) { - IJavaElement[] elements = null; + static IJavaScriptElement[] getSelection(ITextEditor textEditor) { + IJavaScriptElement[] elements = null; IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()); ISelection selection = textEditor.getSelectionProvider().getSelection(); if (selection instanceof ITextSelection) { @@ -51,7 +51,7 @@ } } if (elements == null) { - elements = new IJavaElement[0]; + elements = new IJavaScriptElement[0]; } return elements; }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java index 2fc34b1..33bb1fd 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java
@@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.wst.jsdt.core.IMethod; +import org.eclipse.wst.jsdt.core.IFunction; import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchScope; import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport; import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages; @@ -23,7 +23,7 @@ * @author pavery */ public class JSPMethodRenameChange extends Change { - public static Change[] createChangesFor(IMethod method, String newName) { + public static Change[] createChangesFor(IFunction method, String newName) { JsSearchSupport support = JsSearchSupport.getInstance(); // should be handled by JSPIndexManager // https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3036
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java index 9dfd3ce..ec21cbd 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java
@@ -23,8 +23,8 @@ import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; import org.eclipse.ltk.core.refactoring.participants.RenameParticipant; -import org.eclipse.wst.jsdt.core.IMethod; -import org.eclipse.wst.jsdt.core.JavaModelException; +import org.eclipse.wst.jsdt.core.IFunction; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages; import org.eclipse.wst.jsdt.web.ui.internal.Logger; import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode; @@ -33,7 +33,7 @@ * @author pavery */ public class JSPMethodRenameParticipant extends RenameParticipant { - private IMethod fMethod = null; + private IFunction fMethod = null; /* * (non-Javadoc) @@ -71,7 +71,7 @@ if (this.fMethod != null) { try { name = this.fMethod.getSource(); - } catch (JavaModelException e) { + } catch (JavaScriptModelException e) { Logger.logException(e); } } @@ -83,12 +83,12 @@ */ protected boolean initialize(Object element) { - if (element instanceof IMethod) { - this.fMethod = (IMethod) element; + if (element instanceof IFunction) { + this.fMethod = (IFunction) element; return true; }else if (element instanceof IJavaWebNode) { - if(((IJavaWebNode)element).getJavaElement() instanceof IMethod) { - this.fMethod = (IMethod) ((IJavaWebNode)element).getJavaElement(); + if(((IJavaWebNode)element).getJavaElement() instanceof IFunction) { + this.fMethod = (IFunction) ((IJavaWebNode)element).getJavaElement(); return true; } }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java index 0a3817f..2cba723 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java
@@ -12,7 +12,7 @@ import java.text.MessageFormat; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.core.search.SearchMatch; import org.eclipse.wst.jsdt.web.core.javascript.search.JSDTSearchDocumentDelegate; import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages; @@ -21,7 +21,7 @@ * @author pavery */ public class JSPMethodRenameRequestor extends BasicRefactorSearchRequestor { - public JSPMethodRenameRequestor(IJavaElement element, String newName) { + public JSPMethodRenameRequestor(IJavaScriptElement element, String newName) { super(element, newName); }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java index 3a3fb28..402a1dc 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java
@@ -51,7 +51,7 @@ // eclipse 3.2M5 // public move support: // https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817 - // IJavaElement[] elements = getSelectedElements(); + // IJavaScriptElement[] elements = getSelectedElements(); // if (elements.length > 0) { // // // need to check if it's movable @@ -90,7 +90,7 @@ // PlatformStatusLineUtil.clearStatusLine(); // // } - // catch (JavaModelException e) { + // catch (JavaScriptModelException e) { // Logger.logException(e); // } // }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java index 4a7738d..bedc99e 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java
@@ -11,7 +11,7 @@ package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring; import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages; /** @@ -26,7 +26,7 @@ * @param element * @param newName */ - public JSPPackageRenameRequestor(IJavaElement element, String newName) { + public JSPPackageRenameRequestor(IJavaScriptElement element, String newName) { super(element, newName); }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java index 7676a7d..87205f7 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java
@@ -22,8 +22,8 @@ import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.wst.jsdt.core.IJavaElement; -import org.eclipse.wst.jsdt.core.IMethod; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; +import org.eclipse.wst.jsdt.core.IFunction; import org.eclipse.wst.jsdt.core.IPackageFragment; import org.eclipse.wst.jsdt.core.IType; import org.eclipse.wst.jsdt.ui.refactoring.RenameSupport; @@ -42,10 +42,10 @@ fEditor = null; } - private IJavaElement getSelectedElement() { - IJavaElement element = null; + private IJavaScriptElement getSelectedElement() { + IJavaScriptElement element = null; if (fEditor instanceof ITextEditor) { - IJavaElement[] elements = JSPJavaSelectionProvider.getSelection((ITextEditor) fEditor); + IJavaScriptElement[] elements = JSPJavaSelectionProvider.getSelection((ITextEditor) fEditor); if (elements.length == 1) { element = elements[0]; } @@ -65,18 +65,18 @@ } public void run(IAction action) { - IJavaElement element = getSelectedElement(); + IJavaScriptElement element = getSelectedElement(); if (element != null) { RenameSupport renameSupport = null; try { switch (element.getElementType()) { - case IJavaElement.TYPE: + case IJavaScriptElement.TYPE: renameSupport = RenameSupport.create((IType) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES); break; - case IJavaElement.METHOD: - renameSupport = RenameSupport.create((IMethod) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES); + case IJavaScriptElement.METHOD: + renameSupport = RenameSupport.create((IFunction) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES); break; - case IJavaElement.PACKAGE_FRAGMENT: + case IJavaScriptElement.PACKAGE_FRAGMENT: renameSupport = RenameSupport.create((IPackageFragment) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES); break; }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java index f601903..1aeda8a 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java
@@ -12,7 +12,7 @@ import java.text.MessageFormat; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.core.search.SearchMatch; //import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation; import org.eclipse.wst.jsdt.web.core.javascript.search.JSDTSearchDocumentDelegate; @@ -26,7 +26,7 @@ * @param element * @param newName */ - public JSPTypeMoveRequestor(IJavaElement element, String newPackage) { + public JSPTypeMoveRequestor(IJavaScriptElement element, String newPackage) { super(element, newPackage); }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java index a068ceb..dc1c2a0 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java
@@ -18,7 +18,7 @@ import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; import org.eclipse.ltk.core.refactoring.participants.RenameParticipant; import org.eclipse.wst.jsdt.core.IType; -import org.eclipse.wst.jsdt.core.JavaModelException; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages; import org.eclipse.wst.jsdt.web.ui.internal.Logger; import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode; @@ -63,7 +63,7 @@ if (this.fType != null) { try { name = this.fType.getSource(); - } catch (JavaModelException e) { + } catch (JavaScriptModelException e) { Logger.logException(e); } }
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 35e4ac9..051bf5b 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
@@ -15,7 +15,7 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextSelection; import org.eclipse.search.ui.ISearchQuery; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation; import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter; @@ -32,8 +32,8 @@ * Configures a FindOccurrencesProcessor with JSP partitions and regions */ public class JsFindOccurrencesProcessor extends FindOccurrencesProcessor { - private IJavaElement getJavaElement(IDocument document, ITextSelection textSelection) { - IJavaElement[] elements = getJavaElementsForCurrentSelection(document, textSelection); + private IJavaScriptElement getJavaElement(IDocument document, ITextSelection textSelection) { + IJavaScriptElement[] elements = getJavaElementsForCurrentSelection(document, textSelection); return elements.length > 0 ? elements[0] : null; } @@ -42,8 +42,8 @@ * * @return currently selected IJavaElements */ - private IJavaElement[] getJavaElementsForCurrentSelection(IDocument document, ITextSelection selection) { - IJavaElement[] elements = new IJavaElement[0]; + private IJavaScriptElement[] getJavaElementsForCurrentSelection(IDocument document, ITextSelection selection) { + IJavaScriptElement[] elements = new IJavaScriptElement[0]; // get JSP translation object for this viewer's document IStructuredModel model = null; try {
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java index c241255..851f91e 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java
@@ -15,7 +15,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; import org.eclipse.search.ui.ISearchResult; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.core.search.SearchDocument; import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchScope; import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport; @@ -23,16 +23,16 @@ import org.eclipse.wst.sse.ui.internal.search.BasicSearchQuery; /** - * Implementation of <code>ISearchQuery</code> for <code>IJavaElement</code>s + * Implementation of <code>ISearchQuery</code> for <code>IJavaScriptElement</code>s * in JSP files. * * @author pavery */ public class JsSearchQuery extends BasicSearchQuery { - /** the IJavaElement we are searching for in the file * */ - private IJavaElement fElement = null; + /** the IJavaScriptElement we are searching for in the file * */ + private IJavaScriptElement fElement = null; - public JsSearchQuery(IFile file, IJavaElement element) { + public JsSearchQuery(IFile file, IJavaScriptElement element) { super(file); this.fElement = element; } @@ -84,7 +84,7 @@ return this; } - public IJavaElement getJavaElement() { + public IJavaScriptElement getJavaElement() { return this.fElement; }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java index 2d28421..68d58c6 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java
@@ -13,7 +13,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.core.search.SearchPattern; import org.eclipse.wst.jsdt.core.search.SearchRequestor; import org.eclipse.wst.jsdt.ui.search.ElementQuerySpecification; @@ -63,7 +63,7 @@ if (querySpecification instanceof ElementQuerySpecification) { // element search (eg. from global find references in Java file) ElementQuerySpecification elementQuery = (ElementQuerySpecification) querySpecification; - IJavaElement element = elementQuery.getElement(); + IJavaScriptElement element = elementQuery.getElement(); if (JsQueryParticipant.DEBUG) { System.out.println("JSP Query Participant searching on ELEMENT: " + element); //$NON-NLS-1$ }
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 64d3fcd..0ea5be0 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
@@ -14,9 +14,9 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextViewer; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.core.IMember; -import org.eclipse.wst.jsdt.core.JavaModelException; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; import org.eclipse.wst.jsdt.ui.JavaElementLabels; import org.eclipse.wst.jsdt.ui.JavadocContentAccess; @@ -38,7 +38,7 @@ private final long LABEL_FLAGS = JavaElementLabels.ALL_FULLY_QUALIFIED | JavaElementLabels.M_PRE_RETURNTYPE | JavaElementLabels.M_PARAMETER_TYPES | JavaElementLabels.M_PARAMETER_NAMES | JavaElementLabels.M_EXCEPTIONS | JavaElementLabels.F_PRE_TYPE_SIGNATURE | JavaElementLabels.M_PRE_TYPE_PARAMETERS | JavaElementLabels.T_TYPE_PARAMETERS | JavaElementLabels.USE_RESOLVED; private final long LOCAL_VARIABLE_FLAGS = LABEL_FLAGS & ~JavaElementLabels.F_FULLY_QUALIFIED | JavaElementLabels.F_POST_QUALIFIED; - private String getHoverInfo(IJavaElement[] result) { + private String getHoverInfo(IJavaScriptElement[] result) { StringBuffer buffer = new StringBuffer(); int nResults = result.length; if (nResults == 0) { @@ -47,14 +47,14 @@ if (nResults > 1) { for (int i = 0; i < result.length; i++) { HTMLPrinter.startBulletList(buffer); - IJavaElement curr = result[i]; - if (curr instanceof IMember || curr.getElementType() == IJavaElement.LOCAL_VARIABLE) { + IJavaScriptElement curr = result[i]; + if (curr instanceof IMember || curr.getElementType() == IJavaScriptElement.LOCAL_VARIABLE) { HTMLPrinter.addBullet(buffer, getInfoText(curr)); } HTMLPrinter.endBulletList(buffer); } } else { - IJavaElement curr = result[0]; + IJavaScriptElement curr = result[0]; if (curr == null) { return null; } @@ -64,13 +64,13 @@ Reader reader; try { reader = JavadocContentAccess.getHTMLContentReader(member, true, true); - } catch (JavaModelException ex) { + } catch (JavaScriptModelException ex) { return null; } if (reader != null) { HTMLPrinter.addParagraph(buffer, reader); } - } else if (curr.getElementType() == IJavaElement.LOCAL_VARIABLE || curr.getElementType() == IJavaElement.TYPE_PARAMETER) { + } else if (curr.getElementType() == IJavaScriptElement.LOCAL_VARIABLE || curr.getElementType() == IJavaScriptElement.TYPE_PARAMETER) { HTMLPrinter.addSmallHeader(buffer, getInfoText(curr)); } } @@ -98,15 +98,15 @@ JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class); if (adapter != null) { IJsTranslation translation = adapter.getJSPTranslation(true); - IJavaElement[] result = translation.getElementsFromJsRange(hoverRegion.getOffset(), hoverRegion.getOffset() + hoverRegion.getLength()); + IJavaScriptElement[] result = translation.getElementsFromJsRange(hoverRegion.getOffset(), hoverRegion.getOffset() + hoverRegion.getLength()); // Vector filteredResults = new Vector(); // List badFunctions = translation.getGeneratedFunctionNames(); // boolean bad = false; // for(int i = 0;i<result.length;i++){ // bad=false; -// if(result[i] instanceof IMethod){ +// if(result[i] instanceof IFunction){ // for(int j=0;j<badFunctions.size() && ! bad;j++){ -// if(((IMethod)result[i]).getElementName().equalsIgnoreCase((String)badFunctions.get(j))){ +// if(((IFunction)result[i]).getElementName().equalsIgnoreCase((String)badFunctions.get(j))){ // bad=true; // continue; // } @@ -117,8 +117,8 @@ // if(filteredResults.size()<1) return new String(); // // String filteredResult = -// translation.fixupMangledName(getHoverInfo((IJavaElement[])filteredResults.toArray(new -// IJavaElement[]{}))); +// translation.fixupMangledName(getHoverInfo((IJavaScriptElement[])filteredResults.toArray(new +// IJavaScriptElement[]{}))); // for(int i = 0;i<badFunctions.size();i++){ // filteredResult.replace((String)badFunctions.get(i), ""); // } @@ -144,8 +144,8 @@ return JsWordFinder.findWord(textViewer.getDocument(), offset); } - private String getInfoText(IJavaElement member) { - long flags = member.getElementType() == IJavaElement.LOCAL_VARIABLE ? LOCAL_VARIABLE_FLAGS : LABEL_FLAGS; + private String getInfoText(IJavaScriptElement member) { + long flags = member.getElementType() == IJavaScriptElement.LOCAL_VARIABLE ? LOCAL_VARIABLE_FLAGS : LABEL_FLAGS; String label = JavaElementLabels.getElementLabel(member, flags); StringBuffer buf = new StringBuffer(); for (int i = 0; i < label.length(); i++) {
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java index 492b85d..f59ea0c 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java
@@ -3,7 +3,7 @@ */ package org.eclipse.wst.jsdt.web.ui.views.contentoutline; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.w3c.dom.Node; /** @@ -11,7 +11,7 @@ * */ public interface IJavaWebNode { - public IJavaElement getJavaElement(); + public IJavaScriptElement getJavaElement(); public Node getParentNode();
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 81f7670..c9f1193 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,11 +7,11 @@ 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.ICompilationUnit; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptUnit; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.core.ISourceRange; import org.eclipse.wst.jsdt.core.IType; -import org.eclipse.wst.jsdt.core.JavaModelException; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; import org.eclipse.wst.jsdt.internal.core.JavaElement; import org.eclipse.wst.jsdt.internal.core.SourceRefElement; import org.eclipse.wst.jsdt.ui.JavaElementLabelProvider; @@ -38,21 +38,21 @@ super(adapterFactory); } - private ICompilationUnit lazyCu; + private IJavaScriptUnit lazyCu; private IProgressMonitor monitor; private JavaElementLabelProvider javaElementLabelProvider; public Object[] getChildren(Object object) { - if (object instanceof IJavaElement) { + if (object instanceof IJavaScriptElement) { return getJavaElementProvider().getChildren(object); } if (object instanceof IJavaWebNode) { JavaElement enclosedElement = (JavaElement) ((IJavaWebNode) object).getJavaElement(); if (enclosedElement != null) { try { - IJavaElement[] children = enclosedElement.getChildren(); + IJavaScriptElement[] children = enclosedElement.getChildren(); if (children == null) { - return new IJavaElement[0]; + return new IJavaScriptElement[0]; } Object[] nodes = new Object[children.length]; Node parent = ((IJavaWebNode) object).getParentNode(); @@ -64,7 +64,7 @@ nodes[i] = getJsNode(parent, children[i], position); } return nodes; - } catch (JavaModelException ex) { + } catch (JavaScriptModelException ex) { } } } @@ -84,13 +84,13 @@ protected boolean matches(Object elementObj) { if( elementObj instanceof IJavaWebNode ){ - IJavaElement element = ((IJavaWebNode)elementObj).getJavaElement(); - if (element.getElementType() == IJavaElement.TYPE && element.getParent().getElementType() == IJavaElement.COMPILATION_UNIT ) { + IJavaScriptElement element = ((IJavaWebNode)elementObj).getJavaElement(); + if (element.getElementType() == IJavaScriptElement.TYPE && element.getParent().getElementType() == IJavaScriptElement.COMPILATION_UNIT ) { IType type = (IType)element; try { return type.isAnonymous(); - } catch (JavaModelException e) { + } catch (JavaScriptModelException e) { // TODO Auto-generated catch block e.printStackTrace(); } @@ -129,7 +129,7 @@ } public Object[] getElements(Object object) { - if (object instanceof IJavaElement) { + if (object instanceof IJavaScriptElement) { return getJavaElementProvider().getElements(object); } return super.getElements(object); @@ -146,7 +146,7 @@ return new StandardJavaElementContentProvider(true); } - private Object[] filterChildrenForRange(IJavaElement[] allChildren, Node node) { + private Object[] filterChildrenForRange(IJavaScriptElement[] allChildren, Node node) { int javaPositionStart = ((NodeImpl) node).getStartOffset(); int javaPositionEnd = ((NodeImpl) node).getEndOffset(); @@ -155,17 +155,17 @@ Vector validChildren = new Vector(); for (int i = 0; i < allChildren.length; i++) { - if (allChildren[i] instanceof IJavaElement && allChildren[i].getElementType() != IJavaElement.PACKAGE_DECLARATION) { + if (allChildren[i] instanceof IJavaScriptElement && allChildren[i].getElementType() != IJavaScriptElement.PACKAGE_DECLARATION) { ISourceRange range = null; if (allChildren[i] instanceof SourceRefElement) { try { range = ((SourceRefElement)allChildren[i] ).getSourceRange(); - } catch (JavaModelException e) { + } catch (JavaScriptModelException e) { // TODO Auto-generated catch block e.printStackTrace(); } } - if (allChildren[i].getElementType() == IJavaElement.TYPE || (javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd))) { + if (allChildren[i].getElementType() == IJavaScriptElement.TYPE || (javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd))) { int htmllength = range==null?0:range.getLength(); int htmloffset = range==null?0:range.getOffset(); @@ -183,7 +183,7 @@ result = validChildren.toArray(); } if (result == null || result.length == 0) { - return new IJavaElement[0]; + return new IJavaScriptElement[0]; } return result; } @@ -198,16 +198,16 @@ if (node.getNodeType() == Node.TEXT_NODE && (node instanceof NodeImpl)) { startOffset = ((NodeImpl) node).getStartOffset(); endOffset = ((NodeImpl) node).getEndOffset(); - ICompilationUnit unit = getLazyCu(node); + IJavaScriptUnit unit = getLazyCu(node); try { if(ensureConsistant) unit.makeConsistent(getProgressMonitor()); - } catch (JavaModelException ex1) { + } catch (JavaScriptModelException ex1) { // TODO Auto-generated catch block ex1.printStackTrace(); } try { result = filterChildrenForRange(unit.getChildren(),node); - } catch (JavaModelException ex) { + } catch (JavaScriptModelException ex) { // TODO Auto-generated catch block ex.printStackTrace(); result = new Object[0]; @@ -229,11 +229,11 @@ } - private Object getJsNode(Node parent, IJavaElement root, Position position) { + private Object getJsNode(Node parent, IJavaScriptElement root, Position position) { JsJfaceNode instance = null; - if (root.getElementType() == IJavaElement.TYPE) { + if (root.getElementType() == IJavaScriptElement.TYPE) { instance = new JsJfaceNode(parent, root, position, ((SourceRefElement) root).getElementName()); - } else if (root.getElementType() == IJavaElement.FIELD) { + } else if (root.getElementType() == IJavaScriptElement.FIELD) { /* Field refrence, possibly to a type may need to implement later */ instance = new JsJfaceNode(parent, root, position); } else { @@ -255,7 +255,7 @@ if (node instanceof JsJfaceNode) { return ((JsJfaceNode) node).getImage(); } - if (node instanceof IJavaElement) { + if (node instanceof IJavaScriptElement) { return getJavaElementLabelProvider().getImage(node); } return super.getLabelImage(node); @@ -266,7 +266,7 @@ // if (node instanceof JsJfaceNode) { // return ((JsJfaceNode) node).getName(); // } - if (node instanceof IJavaElement) { + if (node instanceof IJavaScriptElement) { return getJavaElementLabelProvider().getText(node); } return super.getLabelText(node); @@ -274,18 +274,18 @@ public Object getParent(Object element) { - if (element instanceof IJavaElement) { + if (element instanceof IJavaScriptElement) { return getJavaElementProvider().getParent(element); } return super.getParent(element); } - private ICompilationUnit getLazyCu(Node node) { + private IJavaScriptUnit getLazyCu(Node node) { if(lazyCu==null) { lazyCu = getTranslation(node).getCompilationUnit(); try { lazyCu.makeConsistent( new NullProgressMonitor() ); - } catch (JavaModelException e) { + } catch (JavaScriptModelException e) { // TODO Auto-generated catch block e.printStackTrace(); } @@ -322,7 +322,7 @@ public boolean hasChildren(Object object) { - if (object instanceof IJavaElement) { + if (object instanceof IJavaScriptElement) { return getJavaElementProvider().hasChildren(object); } Node node = (Node) object;
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 1f5f4f6..8531e82 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
@@ -4,8 +4,8 @@ import org.eclipse.jface.text.Position; import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.jsdt.core.IJavaElement; -import org.eclipse.wst.jsdt.core.JavaModelException; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; import org.eclipse.wst.jsdt.internal.core.JavaElement; import org.eclipse.wst.jsdt.ui.JavaElementLabelProvider; import org.eclipse.wst.jsdt.web.core.internal.Logger; @@ -38,16 +38,16 @@ private Position fDocPosition; // private Node parent; private String typeName; - //private IJavaElement dirtyElement; + //private IJavaScriptElement dirtyElement; private boolean hasChildren; //private String name; private Image me; - public JsJfaceNode(Node parent, IJavaElement originalElement, Position structureDocLocation) { + public JsJfaceNode(Node parent, IJavaScriptElement originalElement, Position structureDocLocation) { this(parent, originalElement, structureDocLocation, null); } - public JsJfaceNode(Node parent, IJavaElement originalElement, Position structureDocLocation, String typeName) { + public JsJfaceNode(Node parent, IJavaScriptElement originalElement, Position structureDocLocation, String typeName) { //super(); super(((ElementImpl)parent)); // super(parentObject, parentObject.getElementName()); @@ -56,7 +56,7 @@ this.typeName = typeName; try { hasChildren=((JavaElement)originalElement).hasChildren(); - } catch (JavaModelException ex) { + } catch (JavaScriptModelException ex) { hasChildren=false; } removeAttributes(); @@ -70,7 +70,7 @@ public boolean hasChildren() { // try { // return ((JavaElement)this.dirtyElement).hasChildren(); -// } catch (JavaModelException ex) { +// } catch (JavaScriptModelException ex) { // // TODO Auto-generated catch block // ex.printStackTrace(); // } @@ -137,7 +137,7 @@ return adaptableDomNode.getExistingAdapter(type); } - public synchronized IJavaElement getJavaElement() { + public synchronized IJavaScriptElement getJavaElement() { /* * since this may become 'stale' we need to rediscover our element every * time we're asked @@ -146,10 +146,10 @@ int startOffset = getStartOffset(); int endOffset = getLength(); if (typeName != null) { - IJavaElement myType = tran.getCompilationUnit().getType(typeName); + IJavaScriptElement myType = tran.getCompilationUnit().getType(typeName); return myType; } - IJavaElement elements[] = tran.getAllElementsInJsRange(startOffset, startOffset + endOffset); + IJavaScriptElement elements[] = tran.getAllElementsInJsRange(startOffset, startOffset + endOffset); if (elements != null) { return elements[0]; } else {
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 a510e5c..44e655d 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
@@ -2,7 +2,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterForHTML; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.ui.JavaElementLabelProvider; import org.eclipse.wst.jsdt.ui.StandardJavaElementContentProvider; import org.eclipse.wst.jsdt.web.core.internal.Logger; @@ -26,7 +26,7 @@ public Object[] getChildren(Object object) { - if (object instanceof IJavaElement) { + if (object instanceof IJavaScriptElement) { return getJavaElementProvider().getChildren(object); } Node node = (Node) object; @@ -45,7 +45,7 @@ public Object[] getElements(Object object) { - if (object instanceof IJavaElement) { + if (object instanceof IJavaScriptElement) { return getJavaElementProvider().getElements(object); } return super.getElements(object); @@ -66,7 +66,7 @@ int startOffset = 0; int endOffset = 0; int type = node.getNodeType(); - IJavaElement[] result = null; + IJavaScriptElement[] result = null; IJsTranslation translation = null; if (node.getNodeType() == Node.TEXT_NODE && (node instanceof NodeImpl)) { startOffset = ((NodeImpl) node).getStartOffset(); @@ -87,10 +87,10 @@ // htmloffset = translation.getJspOffset(((SourceRefElement) // (result[i])).getSourceRange().getOffset()); // position = new Position(htmloffset, htmllength); -// } catch (JavaModelException e) { +// } catch (JavaScriptModelException e) { // e.printStackTrace(); // } -// newResults[i] = getJsNode(node.getParentNode(), (IJavaElement) result[i], +// newResults[i] = getJsNode(node.getParentNode(), (IJavaScriptElement) result[i], // position); // } // return newResults; @@ -98,7 +98,7 @@ public Image getLabelImage(Object node) { - if (node instanceof IJavaElement) { + if (node instanceof IJavaScriptElement) { return getJavaElementLabelProvider().getImage(node); } return super.getLabelImage(node); @@ -106,7 +106,7 @@ public String getLabelText(Object node) { - if (node instanceof IJavaElement) { + if (node instanceof IJavaScriptElement) { return getJavaElementLabelProvider().getText(node); } return super.getLabelText(node); @@ -114,7 +114,7 @@ public Object getParent(Object element) { - if (element instanceof IJavaElement) { + if (element instanceof IJavaScriptElement) { return getJavaElementProvider().getParent(element); } return super.getParent(element); @@ -149,7 +149,7 @@ public boolean hasChildren(Object object) { - if (object instanceof IJavaElement) { + if (object instanceof IJavaScriptElement) { return getJavaElementProvider().hasChildren(object); } Node node = (Node) object;
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java index 162ec4f..8aa11db 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java
@@ -4,7 +4,7 @@ package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline; import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.jsdt.core.IJavaElement; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; import org.eclipse.wst.jsdt.ui.JavaElementLabelProvider; /** @@ -15,7 +15,7 @@ public Image getImage(Object o) { - if (o instanceof IJavaElement) { + if (o instanceof IJavaScriptElement) { return getJavaElementLabelProvider().getImage(o); } return super.getImage(o); @@ -30,7 +30,7 @@ public String getText(Object o) { - if (o instanceof IJavaElement) { + if (o instanceof IJavaScriptElement) { return getJavaElementLabelProvider().getText(o); } return super.getText(o);