Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeodor Madan2014-11-04 10:05:47 +0000
committerTeodor Madan2014-11-05 09:45:10 +0000
commitb0874844fcd6b9489eb0b90cde2660e0430bbc5d (patch)
treeff4cc38021a257e96dba333604bfc84fe5113b89
parent24cb9ee5475b5b870143bb0063918c0ebf674095 (diff)
downloadorg.eclipse.cdt-b0874844fcd6b9489eb0b90cde2660e0430bbc5d.tar.gz
org.eclipse.cdt-b0874844fcd6b9489eb0b90cde2660e0430bbc5d.tar.xz
org.eclipse.cdt-b0874844fcd6b9489eb0b90cde2660e0430bbc5d.zip
Bug 449913 - "Source Not Found" Editor should present short paths in
editor part name Follow "Show Full Paths" setting in description of a source not found editor Change-Id: I902ebb7052df76a10861b0e9c2cc38903d71003c Signed-off-by: Teodor Madan <teodor.madan@freescale.com> Reviewed-on: https://git.eclipse.org/r/35887 Tested-by: Hudson CI
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
index 77b79b3e27c..64f4ef686b7 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Nokia and others.
+ * Copyright (c) 2010, 2014 Nokia and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,17 +14,21 @@ import java.util.HashMap;
import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.internal.core.sourcelookup.ICSourceNotFoundDescription;
+import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
import org.eclipse.cdt.dsf.concurrent.Query;
import org.eclipse.cdt.dsf.debug.service.IStack;
import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMContext;
import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMData;
+import org.eclipse.cdt.dsf.debug.ui.IDsfDebugUIConstants;
import org.eclipse.cdt.dsf.debug.ui.viewmodel.launch.ILaunchVMConstants;
import org.eclipse.cdt.dsf.debug.ui.viewmodel.launch.MessagesForLaunchVM;
import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin;
import org.eclipse.cdt.dsf.service.DsfServicesTracker;
import org.eclipse.cdt.dsf.service.DsfSession;
import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.preference.IPreferenceStore;
import com.ibm.icu.text.MessageFormat;
@@ -163,7 +167,13 @@ public class CSourceNotFoundDescriptionFactory implements IAdapterFactory {
if (address != null) {
properties.put(ILaunchVMConstants.PROP_FRAME_ADDRESS, "0x" + address.toString(16)); //$NON-NLS-1$
}
- properties.put(ILaunchVMConstants.PROP_FRAME_FILE, data.getFile());
+ String file = data.getFile();
+ IPreferenceStore cStore= CDebugUIPlugin.getDefault().getPreferenceStore();
+ boolean show_full_path = cStore.getBoolean(IDsfDebugUIConstants.DEBUG_VIEW_SHOW_FULL_PATH_PROPERTY);
+ if (!show_full_path) {
+ file = new Path(file).lastSegment();
+ }
+ properties.put(ILaunchVMConstants.PROP_FRAME_FILE, file);
properties.put(ILaunchVMConstants.PROP_FRAME_FUNCTION, data.getFunction());
properties.put(ILaunchVMConstants.PROP_FRAME_LINE, data.getLine());
properties.put(ILaunchVMConstants.PROP_FRAME_COLUMN, data.getColumn());

Back to the top