Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Unified Diff: plugins/org.chromium.debug.core/src/org/chromium/debug/core/util/ScriptTargetMapping.java

Issue 7089017: Change source look-up design (Closed) Base URL: https://chromedevtools.googlecode.com/svn/trunk
Patch Set: fcr Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: plugins/org.chromium.debug.core/src/org/chromium/debug/core/util/ScriptTargetMapping.java
diff --git a/plugins/org.chromium.debug.core/src/org/chromium/debug/core/util/ScriptTargetMapping.java b/plugins/org.chromium.debug.core/src/org/chromium/debug/core/util/ScriptTargetMapping.java
index 9310336ca889fdd903988cc88c0e15fbdea4b99b..8bdefbbb75e2746ac6d120e2092f4a54ddaaa362 100644
--- a/plugins/org.chromium.debug.core/src/org/chromium/debug/core/util/ScriptTargetMapping.java
+++ b/plugins/org.chromium.debug.core/src/org/chromium/debug/core/util/ScriptTargetMapping.java
@@ -4,9 +4,12 @@
package org.chromium.debug.core.util;
+import java.util.Collection;
+
import org.chromium.debug.core.model.ConnectedTargetData;
import org.chromium.debug.core.model.VmResource;
import org.chromium.sdk.JavascriptVm;
+import org.chromium.sdk.Script;
import org.eclipse.core.resources.IFile;
/**
@@ -14,16 +17,23 @@ import org.eclipse.core.resources.IFile;
* on remote VM {@link VmResource}. A file may participate in several mappings simultaneously.
*/
public class ScriptTargetMapping {
+
+ /** Original file that is being mapped, may be workspace file or virtual project file. */
private final IFile file;
- private final VmResource vmResource;
- private final VmResource.ScriptHolder scriptHolder;
+
+ /** Debug session this resource was mapped within. */
private final ConnectedTargetData connectedTargetData;
- public ScriptTargetMapping(IFile file, VmResource vmResource,
- VmResource.ScriptHolder scriptHolder, ConnectedTargetData connectedTargetData) {
+ /**
+ * Set of VmResource's that the file gets mapped to. Must be non-empty. Several resources
+ * are only possible in inaccurate source lookup mode.
+ */
+ private final Collection<? extends VmResource> vmResources;
+
+ public ScriptTargetMapping(IFile file, Collection<? extends VmResource> vmResources,
+ ConnectedTargetData connectedTargetData) {
this.file = file;
- this.vmResource = vmResource;
- this.scriptHolder = scriptHolder;
+ this.vmResources = vmResources;
this.connectedTargetData = connectedTargetData;
}
@@ -31,12 +41,8 @@ public class ScriptTargetMapping {
return file;
}
- public VmResource getVmResource() {
- return vmResource;
- }
-
- public VmResource.ScriptHolder getScriptHolder() {
- return scriptHolder;
+ public Collection<? extends VmResource> getVmResources() {
+ return vmResources;
}
public JavascriptVm getJavascriptVm() {
@@ -46,4 +52,21 @@ public class ScriptTargetMapping {
public ConnectedTargetData getConnectedTargetData() {
return connectedTargetData;
}
+
+ /**
+ * Utility method that works in the most cases.
+ * TODO: re-design program and handle errors nicer than RuntimeException's
+ */
+ public Script getSingleScript() {
+ Collection<? extends VmResource> vmResources = getVmResources();
+ if (vmResources.size() != 1) {
+ throw new RuntimeException("Several resources found");
+ }
+ VmResource resource = vmResources.iterator().next();
+ if (resource.getMetadata() instanceof VmResource.ScriptHolder == false) {
+ throw new RuntimeException("Unsupported type of resource: " + resource.getMetadata());
+ }
+ VmResource.ScriptHolder scriptHolder = (VmResource.ScriptHolder) resource.getMetadata();
+ return scriptHolder.getSingleScript();
+ }
}

Powered by Google App Engine
This is Rietveld 408576698