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

Unified Diff: plugins/org.chromium.debug.ui/src/org/chromium/debug/ui/propertypages/ScriptFilePage.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.ui/src/org/chromium/debug/ui/propertypages/ScriptFilePage.java
diff --git a/plugins/org.chromium.debug.ui/src/org/chromium/debug/ui/propertypages/ScriptFilePage.java b/plugins/org.chromium.debug.ui/src/org/chromium/debug/ui/propertypages/ScriptFilePage.java
index fa19a20c3b6f51f131a1d909f98a404b54df03fc..eb98749564f778b0b6854041850548b8989e2373 100644
--- a/plugins/org.chromium.debug.ui/src/org/chromium/debug/ui/propertypages/ScriptFilePage.java
+++ b/plugins/org.chromium.debug.ui/src/org/chromium/debug/ui/propertypages/ScriptFilePage.java
@@ -4,10 +4,12 @@
package org.chromium.debug.ui.propertypages;
+import java.util.Collection;
import java.util.List;
import org.chromium.debug.core.ChromiumDebugPlugin;
import org.chromium.debug.core.model.DebugTargetImpl;
+import org.chromium.debug.core.model.VmResource;
import org.chromium.debug.core.util.ChromiumDebugPluginUtil;
import org.chromium.debug.core.util.ScriptTargetMapping;
import org.chromium.debug.ui.ChromiumJavascriptDecorator;
@@ -118,12 +120,24 @@ public class ScriptFilePage extends PropertyPage {
}
private void fillScriptProperties(ScriptProperties properties, ScriptTargetMapping input) {
- IFile vprojectFile = input.getFile();
- String fileName =
- ChromiumJavascriptDecorator.getDecoratedText(vprojectFile.getName(), vprojectFile);
- properties.getLocalFileName().setText(fileName);
+ String fileName;
+
+ Collection<? extends VmResource> vmResources = input.getVmResources();
+ String text;
+ if (vmResources.size() == 1) {
+ VmResource resource = vmResources.iterator().next();
+ text = resource.getId().getVisibleName();
+ IFile vprojectFile = resource.getVProjectFile();
+ fileName =
+ ChromiumJavascriptDecorator.getDecoratedText(vprojectFile.getName(), vprojectFile);
+ } else {
+ // TODO: provide better UI for this case.
+ text = Messages.ScriptFilePage_MULTIPLE_INACCURATE_MATCH;
+ fileName = Messages.ScriptFilePage_MULTIPLE_INACCURATE_MATCH;
+ }
- properties.getScriptName().setText(input.getVmResource().getId().getEclipseSourceName());
+ properties.getLocalFileName().setText(fileName);
+ properties.getScriptName().setText(text);
}
private interface ScriptProperties {

Powered by Google App Engine
This is Rietveld 408576698