[228098] rename some apis to better reflect javascript
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java
index 56473ef..3b0119d 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java
@@ -15,7 +15,7 @@
import org.eclipse.jface.text.templates.ContextTypeRegistry;
import org.eclipse.jface.text.templates.persistence.TemplateStore;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.jsdt.internal.ui.JavaPlugin;
+import org.eclipse.wst.jsdt.internal.ui.JavaScriptPlugin;
import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl;
@@ -65,7 +65,7 @@
// registry.addContextType(TemplateContextTypeIdsJSP.TAG);
// registry.addContextType(TemplateContextTypeIdsJSP.ATTRIBUTE);
// registry.addContextType(TemplateContextTypeIdsJSP.ATTRIBUTE_VALUE);
- fContextTypeRegistry = JavaPlugin.getDefault().getCodeTemplateContextRegistry();
+ fContextTypeRegistry = JavaScriptPlugin.getDefault().getCodeTemplateContextRegistry();
}
return fContextTypeRegistry;
}
@@ -80,7 +80,7 @@
// fTemplateStore = new ContributionTemplateStore(
// getTemplateContextRegistry(), getPreferenceStore(),
// JSPUIPreferenceNames.TEMPLATES_KEY);
- JavaPlugin jp = JavaPlugin.getDefault();
+ JavaScriptPlugin jp = JavaScriptPlugin.getDefault();
fTemplateStore = jp.getTemplateStore();
try {
fTemplateStore.load();
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 7b43074..a20a5e4 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
@@ -4,7 +4,7 @@
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.ui.IEditorPart;
import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.ui.JavaUI;
+import org.eclipse.wst.jsdt.ui.JavaScriptUI;
import org.eclipse.wst.jsdt.web.ui.internal.Logger;
/**
@@ -55,9 +55,9 @@
*/
public void open() {
try {
- IEditorPart editor = JavaUI.openInEditor(fElement);
+ IEditorPart editor = JavaScriptUI.openInEditor(fElement);
if (editor != null) {
- JavaUI.revealInEditor(editor, fElement);
+ JavaScriptUI.revealInEditor(editor, fElement);
}
} catch (Exception e) {
Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
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 0ea5be0..fc0d7e3 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
@@ -17,8 +17,8 @@
import org.eclipse.wst.jsdt.core.IJavaScriptElement;
import org.eclipse.wst.jsdt.core.IMember;
import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.ui.JavaElementLabels;
-import org.eclipse.wst.jsdt.ui.JavadocContentAccess;
+import org.eclipse.wst.jsdt.ui.JavaScriptElementLabels;
+import org.eclipse.wst.jsdt.ui.JSdocContentAccess;
import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
@@ -35,8 +35,8 @@
* Bulk of the work was copied from
* org.eclipse.wst.jsdt.internal.ui.text.java.hover.JavadocHover
*/
- 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 final long LABEL_FLAGS = JavaScriptElementLabels.ALL_FULLY_QUALIFIED | JavaScriptElementLabels.M_PRE_RETURNTYPE | JavaScriptElementLabels.M_PARAMETER_TYPES | JavaScriptElementLabels.M_PARAMETER_NAMES | JavaScriptElementLabels.M_EXCEPTIONS | JavaScriptElementLabels.F_PRE_TYPE_SIGNATURE | JavaScriptElementLabels.M_PRE_TYPE_PARAMETERS | JavaScriptElementLabels.T_TYPE_PARAMETERS | JavaScriptElementLabels.USE_RESOLVED;
+ private final long LOCAL_VARIABLE_FLAGS = LABEL_FLAGS & ~JavaScriptElementLabels.F_FULLY_QUALIFIED | JavaScriptElementLabels.F_POST_QUALIFIED;
private String getHoverInfo(IJavaScriptElement[] result) {
StringBuffer buffer = new StringBuffer();
@@ -63,7 +63,7 @@
HTMLPrinter.addSmallHeader(buffer, getInfoText(member));
Reader reader;
try {
- reader = JavadocContentAccess.getHTMLContentReader(member, true, true);
+ reader = JSdocContentAccess.getHTMLContentReader(member, true, true);
} catch (JavaScriptModelException ex) {
return null;
}
@@ -146,7 +146,7 @@
private String getInfoText(IJavaScriptElement member) {
long flags = member.getElementType() == IJavaScriptElement.LOCAL_VARIABLE ? LOCAL_VARIABLE_FLAGS : LABEL_FLAGS;
- String label = JavaElementLabels.getElementLabel(member, flags);
+ String label = JavaScriptElementLabels.getElementLabel(member, flags);
StringBuffer buf = new StringBuffer();
for (int i = 0; i < label.length(); i++) {
char ch = label.charAt(i);
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 c9f1193..0b085ab 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
@@ -14,8 +14,8 @@
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;
-import org.eclipse.wst.jsdt.ui.StandardJavaElementContentProvider;
+import org.eclipse.wst.jsdt.ui.JavaScriptElementLabelProvider;
+import org.eclipse.wst.jsdt.ui.StandardJavaScriptElementContentProvider;
import org.eclipse.wst.jsdt.web.core.internal.Logger;
import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
import org.eclipse.wst.jsdt.web.core.javascript.JsTranslation;
@@ -40,7 +40,7 @@
private IJavaScriptUnit lazyCu;
private IProgressMonitor monitor;
- private JavaElementLabelProvider javaElementLabelProvider;
+ private JavaScriptElementLabelProvider javaElementLabelProvider;
public Object[] getChildren(Object object) {
if (object instanceof IJavaScriptElement) {
@@ -85,7 +85,7 @@
if( elementObj instanceof IJavaWebNode ){
IJavaScriptElement element = ((IJavaWebNode)elementObj).getJavaElement();
- if (element.getElementType() == IJavaScriptElement.TYPE && element.getParent().getElementType() == IJavaScriptElement.COMPILATION_UNIT ) {
+ if (element.getElementType() == IJavaScriptElement.TYPE && element.getParent().getElementType() == IJavaScriptElement.JAVASCRIPT_UNIT ) {
IType type = (IType)element;
try {
@@ -135,15 +135,15 @@
return super.getElements(object);
}
- private JavaElementLabelProvider getJavaElementLabelProvider() {
+ private JavaScriptElementLabelProvider getJavaElementLabelProvider() {
if(javaElementLabelProvider==null) {
- javaElementLabelProvider = new JavaElementLabelProvider();
+ javaElementLabelProvider = new JavaScriptElementLabelProvider();
}
return javaElementLabelProvider;
}
- private StandardJavaElementContentProvider getJavaElementProvider() {
- return new StandardJavaElementContentProvider(true);
+ private StandardJavaScriptElementContentProvider getJavaElementProvider() {
+ return new StandardJavaScriptElementContentProvider(true);
}
private Object[] filterChildrenForRange(IJavaScriptElement[] allChildren, Node node) {
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 8531e82..2d5cf9a 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
@@ -7,7 +7,7 @@
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.ui.JavaScriptElementLabelProvider;
import org.eclipse.wst.jsdt.web.core.internal.Logger;
import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
@@ -60,7 +60,7 @@
hasChildren=false;
}
removeAttributes();
- me = (new JavaElementLabelProvider()).getImage(originalElement);
+ me = (new JavaScriptElementLabelProvider()).getImage(originalElement);
}
public Image getImage() {
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 44e655d..6d70bf2 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
@@ -3,8 +3,8 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterForHTML;
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.ui.JavaScriptElementLabelProvider;
+import org.eclipse.wst.jsdt.ui.StandardJavaScriptElementContentProvider;
import org.eclipse.wst.jsdt.web.core.internal.Logger;
import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
@@ -51,12 +51,12 @@
return super.getElements(object);
}
- private JavaElementLabelProvider getJavaElementLabelProvider() {
- return new JavaElementLabelProvider();
+ private JavaScriptElementLabelProvider getJavaElementLabelProvider() {
+ return new JavaScriptElementLabelProvider();
}
- private StandardJavaElementContentProvider getJavaElementProvider() {
- return new StandardJavaElementContentProvider(true);
+ private StandardJavaScriptElementContentProvider getJavaElementProvider() {
+ return new StandardJavaScriptElementContentProvider(true);
}
private synchronized Object[] getJSElementsFromNode(Node node) {
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 8aa11db..6e44526 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
@@ -5,13 +5,13 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.ui.JavaElementLabelProvider;
+import org.eclipse.wst.jsdt.ui.JavaScriptElementLabelProvider;
/**
* @author childsb copyright ibm 2007
*/
public class JsLabelProvider extends XMLLabelProvider {
- JavaElementLabelProvider fLabelProvider = null;
+ JavaScriptElementLabelProvider fLabelProvider = null;
public Image getImage(Object o) {
@@ -21,9 +21,9 @@
return super.getImage(o);
}
- private JavaElementLabelProvider getJavaElementLabelProvider() {
+ private JavaScriptElementLabelProvider getJavaElementLabelProvider() {
if (fLabelProvider == null) {
- fLabelProvider = new JavaElementLabelProvider();
+ fLabelProvider = new JavaScriptElementLabelProvider();
}
return fLabelProvider;
}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java
index ff56b97..158bd7f 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java
@@ -119,7 +119,7 @@
//
//
//
-// JavaPlugin.createStandardGroups(manager);
+// JavaScriptPlugin.createStandardGroups(manager);
// String[] actionSets = JSDTActionSetUtil.getAllActionSets();
//
// IAction[] actions = JSDTActionSetUtil.getActionsFromSet(actionSets);
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java
index 6eeb8cd..bd1b503 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java
@@ -3,10 +3,10 @@
*/
package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-import org.eclipse.wst.jsdt.ui.StandardJavaElementContentProvider;
+import org.eclipse.wst.jsdt.ui.StandardJavaScriptElementContentProvider;
/**
* @author childsb
*
*/
-public class JsWebElementProvider extends StandardJavaElementContentProvider {}
+public class JsWebElementProvider extends StandardJavaScriptElementContentProvider {}
