(v2) Remove dependencies on WST problem markers.

Author: PhaserEditor2D

source/v2/phasereditor/phasereditor.project.core/plugin.xml

@@ -35,7 +35,7 @@
             value="true">
       </persistent>
       <super
-            type="org.eclipse.wst.jsdt.core.problem">
+            type="org.eclipse.core.resources.problemmarker">
       </super>
    </extension>
 </plugin>

source/v2/phasereditor/phasereditor.project.core/src/phasereditor/project/core/PhaserProjectNature.java

@@ -53,49 +53,13 @@ public static void addPhaserNature(IProject project, SourceLang lang, IProgressM
 			description.setNatureIds(newNatures);
 			project.setDescription(description, monitor);
 
-			//TODO: #RemovingWST
-//			resetProjectLibraries(project, lang, monitor);
-
 		} else {
 			if (monitor != null) {
 				monitor.worked(1);
 			}
 		}
 	}
 
-//TODO: #RemovingWST
-//	public static void resetProjectLibraries(IProject project, SourceLang lang, IProgressMonitor monitor)
-//			throws JavaScriptModelException {
-//
-//		if (lang != SourceLang.JAVA_SCRIPT) {
-//			return;
-//		}
-//
-//		IJavaScriptProject jsProject = JavaScriptCore.create(project);
-//
-//		// add libs
-//
-//		List<IIncludePathEntry> list = new ArrayList<>();
-//		for (String id : new String[] { ProjectCore.ECMA5_SCOPE_INITIALIZER_ID,
-//				ProjectCore.BROWSER_SCOPE_INITIALIZER_ID, ProjectCore.GLOBAL_SCOPE_INITIALIZER_ID }) {
-//			list.add(JavaScriptCore.newContainerEntry(new Path(id)));
-//		}
-//
-//		// add source
-//
-//		IPath[] exclude = { new Path("**/lib"), new Path("**/phaser.js"), new Path("**/*.min.js"),
-//				new Path("**/node_modules") };
-//		IIncludePathEntry srcEntry = JavaScriptCore.newSourceEntry(project.getFullPath(), exclude);
-//		list.add(srcEntry);
-//
-//		IIncludePathEntry[] newIncludeEntries = new IIncludePathEntry[list.size()];
-//		list.toArray(newIncludeEntries);
-//
-//		out.println("Include entries: " + Arrays.toString(newIncludeEntries));
-//
-//		jsProject.setRawIncludepath(newIncludeEntries, monitor);
-//	}
-
 	public static void removePhaserNature(IProject project, IProgressMonitor monitor) throws CoreException {
 		if (monitor != null && monitor.isCanceled()) {
 			throw new OperationCanceledException();

source/v2/phasereditor/phasereditor.project.ui/plugin.xml

@@ -186,7 +186,7 @@
          point="org.eclipse.ui.decorators">
       <decorator
             class="phasereditor.project.ui.PhaserProblemLabelDecorator"            
-            icon="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/obj16/error_obj.gif #RemovingWST"
+            icon="platform:/plugin/org.eclipse.ui/icons/full/ovr16/error_ovr.png"
             id="phasereditor.project.ui.problemsDecorator"
             label="Phaser Problems Decorator"
             lightweight="true"

source/v2/phasereditor/phasereditor.project.ui/src/phasereditor/project/ui/PhaserProblemLabelDecorator.java

@@ -1,8 +1,10 @@
 package phasereditor.project.ui;
 
+import java.net.URL;
+
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IDecoration;
@@ -11,7 +13,6 @@
 
 import phasereditor.project.core.ProjectCore;
 
-@SuppressWarnings("restriction")
 public class PhaserProblemLabelDecorator implements ILightweightLabelDecorator {
 	private ListenerList<ILabelProviderListener> _listeners;
 
@@ -31,8 +32,7 @@ public void removeListener(ILabelProviderListener listener) {
 
 	@Override
 	public void dispose() {
-		// TODO Auto-generated method stub
-
+		//
 	}
 
 	@Override
@@ -52,13 +52,12 @@ public void decorate(Object element, IDecoration decoration) {
 					ImageDescriptor img;
 
 					switch (severity) {
-					//TODO: #RemovingWST
-//					case IMarker.SEVERITY_ERROR:
-//						img = JavaPluginImages.DESC_OVR_ERROR;
-//						break;
-//					case IMarker.SEVERITY_WARNING:
-//						img = JavaPluginImages.DESC_OVR_WARNING;
-//						break;
+					case IMarker.SEVERITY_ERROR:
+						img = ImageDescriptor.createFromURL(new URL("platform:/plugin/org.eclipse.ui/icons/full/ovr16/error_ovr.png"));
+						break;
+					case IMarker.SEVERITY_WARNING:
+						img = ImageDescriptor.createFromURL(new URL("platform:/plugin/org.eclipse.ui/icons/full/ovr16/warning_ovr.png"));
+						break;
 					default:
 						img = null;
 						break;
@@ -68,7 +67,7 @@ public void decorate(Object element, IDecoration decoration) {
 						decoration.addOverlay(img);
 					}
 				}
-			} catch (CoreException e) {
+			} catch (Exception e) {
 				ProjectUI.logError(e);
 			}
 		}