# HG changeset patch
# User wpaul
# Date 1249670903 18000
# Node ID c27198dd54055342a6f7752c2b085a94237ebc2d
# Parent  f043313928a033cad9eeb3f1811b14d9ab8c238a
fixed executables view merge problems - bug #'s 9562, 9568, 9571.

diff -r f043313928a0 -r c27198dd5405 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java	Fri Aug 07 10:28:14 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java	Fri Aug 07 13:48:23 2009 -0500
@@ -16,7 +16,6 @@
 */
 package com.nokia.cdt.debug.cw.symbian.ui.executables;
 
-import org.eclipse.cdt.debug.core.executables.Executable;
 import org.eclipse.cdt.debug.core.executables.ISourceFileRemapping;
 import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator;
 import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector;
@@ -34,13 +33,13 @@
 
 public class SymbianSourceFileRemapping implements ISourceFileRemapping {
 
-	public String remapSourceFile(Executable executable, String filePath) {
+	public String remapSourceFile(IPath executable, String filePath) {
 
 		String epocRoot = "";
-		String[] segs = executable.getPath().segments();
+		String[] segs = executable.segments();
 		for (int i = 0; i < segs.length; i++) {
 			if (segs[i].equalsIgnoreCase("epoc32"))
-				epocRoot = executable.getPath().removeLastSegments(segs.length - i).toOSString();				
+				epocRoot = executable.removeLastSegments(segs.length - i).toOSString();				
 		}
 		if (epocRoot.length() > 0)
 		{