core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/internal/ui/images/MaskedFileImageModel.java
equal
deleted
inserted
replaced
60 if (maskPath.isAbsolute() || maskPath.getDevice() != null) |
60 if (maskPath.isAbsolute() || maskPath.getDevice() != null) |
61 maskSourceLocation = maskPath; |
61 maskSourceLocation = maskPath; |
62 else |
62 else |
63 maskSourceLocation = basePath.append(maskPath); |
63 maskSourceLocation = basePath.append(maskPath); |
64 } |
64 } |
65 if (maskSourceLocation != null && maskSourceLocation.getDevice() == null){ |
|
66 maskSourceLocation = maskSourceLocation.setDevice(basePath.getDevice()); |
|
67 } |
|
68 } |
65 } |
69 |
66 |
70 /** |
67 /** |
71 * @param containerModel |
68 * @param containerModel |
72 * @param project |
69 * @param project |
81 if (maskPath != null) { |
78 if (maskPath != null) { |
82 if (maskPath.isAbsolute() || maskPath.getDevice() != null) |
79 if (maskPath.isAbsolute() || maskPath.getDevice() != null) |
83 maskSourceLocation = maskPath; |
80 maskSourceLocation = maskPath; |
84 else |
81 else |
85 maskSourceLocation = basePath.append(maskPath); |
82 maskSourceLocation = basePath.append(maskPath); |
86 } |
|
87 if (maskSourceLocation != null && maskSourceLocation.getDevice() == null){ |
|
88 maskSourceLocation = maskSourceLocation.setDevice(basePath.getDevice()); |
|
89 } |
83 } |
90 } |
84 } |
91 |
85 |
92 |
86 |
93 @Override |
87 @Override |