Updates to images + Libraries.
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF index b30ba1f..d825042 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ org.eclipse.wst.jsdt.web.core.internal.java;x-friends:="org.eclipse.wst.jsdt.web.ui", org.eclipse.wst.jsdt.web.core.internal.java.search;x-friends:="org.eclipse.wst.jsdt.web.ui", org.eclipse.wst.jsdt.web.core.internal.modelhandler;x-friends:="org.eclipse.wst.jsdt.web.ui", + org.eclipse.wst.jsdt.web.core.internal.project, org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype;x-friends:="org.eclipse.wst.jsdt.web.ui", org.eclipse.wst.jsdt.web.core.internal.provisional.text;x-friends:="org.eclipse.wst.jsdt.web.ui", org.eclipse.wst.jsdt.web.core.internal.tasks;x-friends:="org.eclipse.wst.jsdt.web.ui",
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml index c3cc891..0afff3a 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml +++ b/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml
@@ -30,13 +30,7 @@ <builder id="org.eclipse.wst.jsdt.web.core.embeded.javascript"/> </extension> - <extension point="org.eclipse.wst.jsdt.core.classpathContainerInitializer"> - <classpathContainerInitializer - class="org.eclipse.wst.jsdt.web.core.internal.project.WebProjectClassPathContainerInitializer" - id="org.eclipse.wst.jsdt.launching.WebProject"> - </classpathContainerInitializer> - </extension> - + <!-- Not using this at the moment, but everythings in place if we need in the future. -->
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 45ed981..f000e69 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
@@ -27,7 +27,8 @@ private static final String NATURE_IDS[] = { JavaCore.NATURE_ID }; public static final IPath VIRTUAL_BROWSER_CLASSPATH = new Path("org.eclipse.wst.jsdt.launching.baseBrowserLibrary"); - public static final IClasspathEntry VIRTUAL_SCOPE_ENTRY = JavaCore.newContainerEntry(new Path(WebProjectClassPathContainerInitializer.VIRTUAL_CONTAINER)); + public static final String VIRTUAL_CONTAINER = "org.eclipse.wst.jsdt.launching.WebProject"; + public static final IClasspathEntry VIRTUAL_SCOPE_ENTRY = JavaCore.newContainerEntry(new Path(VIRTUAL_CONTAINER)); private static final String SUPER_TYPE_NAME = "Window"; private static final String SUPER_TYPE_LIBRARY = "org.eclipse.wst.jsdt.launching.baseBrowserLibrary";
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml index c55d4ca..e8d3078 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml +++ b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
@@ -662,6 +662,14 @@ </with> </enablement> </renameParticipant> - + + </extension> + <extension point="org.eclipse.wst.jsdt.core.classpathContainerInitializer"> + <classpathContainerInitializer + class="org.eclipse.wst.jsdt.web.ui.WebProjectClassPathContainerInitializer" + id="org.eclipse.wst.jsdt.launching.WebProject"> + </classpathContainerInitializer> + </extension> + </plugin>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectClassPathContainerInitializer.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectClassPathContainerInitializer.java similarity index 83% rename from bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectClassPathContainerInitializer.java rename to bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectClassPathContainerInitializer.java index 191e205..ea4093d 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectClassPathContainerInitializer.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectClassPathContainerInitializer.java
@@ -1,35 +1,38 @@ /** * */ -package org.eclipse.wst.jsdt.web.core.internal.project; +package org.eclipse.wst.jsdt.web.ui; import java.net.URI; import java.net.URISyntaxException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.wst.jsdt.core.ClasspathContainerInitializer; import org.eclipse.wst.jsdt.core.IClasspathContainer; import org.eclipse.wst.jsdt.core.IJavaProject; import org.eclipse.wst.jsdt.core.compiler.libraries.LibraryLocation; import org.eclipse.wst.jsdt.core.compiler.libraries.SystemLibraryLocation; +import org.eclipse.wst.jsdt.internal.ui.IClasspathContainerInitialzerExtension; import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin; import org.eclipse.wst.jsdt.web.core.internal.java.JsNameManglerUtil; +import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature; /** * @author childsb * */ -public class WebProjectClassPathContainerInitializer extends ClasspathContainerInitializer { +public class WebProjectClassPathContainerInitializer extends ClasspathContainerInitializer implements IClasspathContainerInitialzerExtension { private static final String CONTAINER_DESCRIPTION = "Web Project support for JSDT"; public static final char[] LIB_NAME = {'b','r','o','w','s','e','r','W','i','n','d','o','w','.','j','s'}; /* Some tokens for us to identify mangled paths */ private static final String MANGLED_BUTT1 = "htm"; private static final String MANGLED_BUTT2 = ".js"; - public static final String VIRTUAL_CONTAINER = "org.eclipse.wst.jsdt.launching.WebProject"; + private static String getUnmangedHtmlPath(String containerPathString) { if (containerPathString == null) { @@ -91,7 +94,7 @@ */ public String getDescription(IPath containerPath, IJavaProject project) { - if (containerPath.equals(new Path(WebProjectClassPathContainerInitializer.VIRTUAL_CONTAINER))) { + if (containerPath.equals(new Path(JsWebNature.VIRTUAL_CONTAINER))) { return WebProjectClassPathContainerInitializer.CONTAINER_DESCRIPTION; } String containerPathString = containerPath.toString(); @@ -143,6 +146,13 @@ public IPath getPath() { - return new Path(WebProjectClassPathContainerInitializer.VIRTUAL_CONTAINER); + return new Path(JsWebNature.VIRTUAL_CONTAINER); } + /* (non-Javadoc) + * @see org.eclipse.wst.jsdt.internal.ui.IClasspathContainerInitialzerExtension#getImage(org.eclipse.core.runtime.IPath, java.lang.String, org.eclipse.wst.jsdt.core.IJavaProject) + */ + public ImageDescriptor getImage(IPath containerPath, String element, IJavaProject project) { + return ImageDescriptor.createFromFile(this.getClass(),"web1.gif"); + } + }
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.GIF b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.GIF new file mode 100644 index 0000000..a9a220d --- /dev/null +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.GIF Binary files differ
