core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/FileImageModel.java
equal
deleted
inserted
replaced
58 if (filePath != null) { |
58 if (filePath != null) { |
59 this.sourceLocation = basePath != null && filePath.getDevice() == null && !filePath.isAbsolute() |
59 this.sourceLocation = basePath != null && filePath.getDevice() == null && !filePath.isAbsolute() |
60 ? basePath.append(filePath) : filePath; |
60 ? basePath.append(filePath) : filePath; |
61 } |
61 } |
62 |
62 |
63 if (sourceLocation.getDevice() == null){ |
63 if (this.sourceLocation != null && this.sourceLocation.getDevice() == null){ |
64 sourceLocation = sourceLocation.setDevice(basePath.getDevice()); |
64 this.sourceLocation = this.sourceLocation.setDevice(basePath.getDevice()); |
65 } |
65 } |
66 |
66 |
67 } |
67 } |
68 |
68 |
69 /** |
69 /** |