# HG changeset patch
# User timkelly
# Date 1250622803 18000
# Node ID f67171885c66c3595c1133db1cd178fc70c8615b
# Parent  5018b19f09528ebfe03d365207838716cbf75cbf
revert last two commits for bug 9642. A different fix is needed.

diff -r 5018b19f0952 -r f67171885c66 core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/FileImageModel.java
--- a/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/FileImageModel.java	Tue Aug 18 11:47:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/FileImageModel.java	Tue Aug 18 14:13:23 2009 -0500
@@ -60,10 +60,6 @@
 				? basePath.append(filePath) : filePath;
 		}
 		
-		if (this.sourceLocation != null && this.sourceLocation.getDevice() == null){
-			this.sourceLocation = this.sourceLocation.setDevice(basePath.getDevice());
-		}
-		
 	}
 	
 	/**
diff -r 5018b19f0952 -r f67171885c66 core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/MaskedFileImageModel.java
--- a/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/MaskedFileImageModel.java	Tue Aug 18 11:47:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/MaskedFileImageModel.java	Tue Aug 18 14:13:23 2009 -0500
@@ -62,9 +62,6 @@
 			else
 				maskSourceLocation = basePath.append(maskPath);
 		}
-		if (maskSourceLocation != null && maskSourceLocation.getDevice() == null){
-			maskSourceLocation = maskSourceLocation.setDevice(basePath.getDevice());
-		}
 	}
 
 	/**
@@ -84,9 +81,6 @@
 			else
 				maskSourceLocation = basePath.append(maskPath);
 		}
-		if (maskSourceLocation != null && maskSourceLocation.getDevice() == null){
-			maskSourceLocation = maskSourceLocation.setDevice(basePath.getDevice());
-		}
 	}