mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 345124 - NPE while Toggle Source/Header

Browse source
This commit is contained in:
Anton Leherbauer 2011-05-12 09:31:11 +00:00
parent b414e5add0
commit a5750c313d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SourceHeaderPartnerFinder.java
View file

@ -10,7 +10,6 @@
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* Marc-Andre Laperle - Extracted Util class from ToggleSourceHeaderAction * Marc-Andre Laperle - Extracted Util class from ToggleSourceHeaderAction
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.editor; package org.eclipse.cdt.internal.ui.editor;
import java.util.HashMap; import java.util.HashMap;
@ -286,7 +285,8 @@ public final class SourceHeaderPartnerFinder {
String partnerFileBasename= partnerBasePath.addFileExtension(ext).lastSegment(); String partnerFileBasename= partnerBasePath.addFileExtension(ext).lastSegment();
IFile partnerFile= null; IFile partnerFile= null;
IContainer container = tu.getResource().getParent(); IResource resource = tu.getResource();
IContainer container = resource != null ? resource.getParent() : null;
while (container != null && partnerFile == null && !(container instanceof IWorkspaceRoot)) { while (container != null && partnerFile == null && !(container instanceof IWorkspaceRoot)) {
partnerFile= findInContainer(container, partnerFileBasename); partnerFile= findInContainer(container, partnerFileBasename);
container = container.getParent(); container = container.getParent();
@ -299,7 +299,7 @@ public final class SourceHeaderPartnerFinder {
} }
} }
// External translation unit - try in same directory // External translation unit - try in same directory
if (tu.getResource() == null) { if (resource == null) {
IPath partnerFileLoation= partnerBasePath.removeLastSegments(1).append(partnerFileBasename); IPath partnerFileLoation= partnerBasePath.removeLastSegments(1).append(partnerFileBasename);
ITranslationUnit partnerUnit= CoreModel.getDefault().createTranslationUnitFrom( ITranslationUnit partnerUnit= CoreModel.getDefault().createTranslationUnitFrom(
tu.getCProject(), partnerFileLoation); tu.getCProject(), partnerFileLoation);