mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 21:05:37 +02:00
Code Issues Wiki Activity

Fix for 218266: [patch] Wrong path returned for ExternalTranslationUnit working copies (patch by Warren Paul)

Browse source
This commit is contained in:
Anton Leherbauer 2008-02-14 08:10:37 +00:00
parent 8ece714199
commit a3aab7e451
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ExternalTranslationUnit.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2007 QNX Software Systems and others. * Copyright (c) 2000, 2008 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -8,6 +8,7 @@
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Anton Leherbauer (Wind River Systems) * Anton Leherbauer (Wind River Systems)
* Warren Paul (Nokia) - Bug 218266
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.model; package org.eclipse.cdt.internal.core.model;
@ -15,7 +16,6 @@ package org.eclipse.cdt.internal.core.model;
import java.net.URI; import java.net.URI;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.core.runtime.IPath;
/** /**
* ExternalTranslationUnit * ExternalTranslationUnit
@ -29,9 +29,5 @@ public class ExternalTranslationUnit extends TranslationUnit {
public ExternalTranslationUnit(ICElement parent, URI uri, String contentTypeID) { public ExternalTranslationUnit(ICElement parent, URI uri, String contentTypeID) {
super(parent, uri, contentTypeID); super(parent, uri, contentTypeID);
} }
public IPath getPath() {
return getLocation();
}
} }

11
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java
View file

@ -10,6 +10,7 @@
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* IBM Corporation * IBM Corporation
* Anton Leherbauer (Wind River Systems) * Anton Leherbauer (Wind River Systems)
* Warren Paul (Nokia) - Bug 218266
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.model; package org.eclipse.cdt.internal.core.model;
@ -928,5 +929,15 @@ public class TranslationUnit extends Openable implements ITranslationUnit {
return result != null ? result : getLanguage(); return result != null ? result : getLanguage();
} }
public IPath getPath() {
if (getFile() != null) {
return super.getPath();
}
IPath path= getLocation();
if (path != null) {
return path;
}
return super.getPath();
}
} }