Bug 189497 - Adding a java breakpoint exception should enable it
diff --git a/bundles/org.eclipse.e4.languages.javascript.debug.ui/src/org/eclipse/e4/languages/internal/javascript/debug/ui/JSDIModelPresentation.java b/bundles/org.eclipse.e4.languages.javascript.debug.ui/src/org/eclipse/e4/languages/internal/javascript/debug/ui/JSDIModelPresentation.java
index b4626bb..67abaea 100644
--- a/bundles/org.eclipse.e4.languages.javascript.debug.ui/src/org/eclipse/e4/languages/internal/javascript/debug/ui/JSDIModelPresentation.java
+++ b/bundles/org.eclipse.e4.languages.javascript.debug.ui/src/org/eclipse/e4/languages/internal/javascript/debug/ui/JSDIModelPresentation.java
@@ -16,6 +16,7 @@
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -354,6 +355,19 @@
if(element instanceof IFile) {
return new FileEditorInput((IFile) element);
}
+ if(element instanceof JSDIScriptLoadBreakpoint) {
+ try {
+ JSDIScriptLoadBreakpoint bp = (JSDIScriptLoadBreakpoint) element;
+ IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(bp.getScriptPath()));
+ if(resource.getType() == IResource.FILE) {
+ return new FileEditorInput((IFile) resource);
+ }
+ }
+ catch(CoreException ce) {
+ //TODO log this
+ ce.printStackTrace();
+ }
+ }
if(element instanceof JSDIBreakpoint) {
IResource resource = ((JSDIBreakpoint)element).getMarker().getResource();
if(resource.getType() == IResource.FILE) {
diff --git a/bundles/org.eclipse.e4.languages.javascript.debug.ui/src/org/eclipse/e4/languages/internal/javascript/debug/ui/actions/AddScriptLoadBreakpointAction.java b/bundles/org.eclipse.e4.languages.javascript.debug.ui/src/org/eclipse/e4/languages/internal/javascript/debug/ui/actions/AddScriptLoadBreakpointAction.java
index 074db3e..47e871f 100644
--- a/bundles/org.eclipse.e4.languages.javascript.debug.ui/src/org/eclipse/e4/languages/internal/javascript/debug/ui/actions/AddScriptLoadBreakpointAction.java
+++ b/bundles/org.eclipse.e4.languages.javascript.debug.ui/src/org/eclipse/e4/languages/internal/javascript/debug/ui/actions/AddScriptLoadBreakpointAction.java
@@ -65,7 +65,7 @@
attributes.put(JSDIBreakpoint.TYPE_NAME, scriptname);
attributes.put(JSDIBreakpoint.SCRIPT_PATH, scriptpath);
try {
- new JSDIScriptLoadBreakpoint(file, 0, 0, attributes, true);
+ new JSDIScriptLoadBreakpoint(ResourcesPlugin.getWorkspace().getRoot(), 0, 0, attributes, true);
}
catch(DebugException de) {
//TODO log this
