diff --git a/core/org.eclipse.cdt.core/.settings/.api_filters b/core/org.eclipse.cdt.core/.settings/.api_filters index 8f12862a69b..2aae30a0706 100644 --- a/core/org.eclipse.cdt.core/.settings/.api_filters +++ b/core/org.eclipse.cdt.core/.settings/.api_filters @@ -1,4 +1,5 @@ - + + @@ -41,12 +42,4 @@ - - - - - - - - - \ No newline at end of file + diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java index 2c577cad3a1..a548cc9b98b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. + * Copyright (c) 2000, 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,7 +8,6 @@ * Contributors: * QNX Software Systems - Initial API and implementation * Markus Schorn (Wind River Systems) - * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.core.model; @@ -487,15 +486,5 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource @Deprecated org.eclipse.cdt.core.parser.CodeReader getCodeReader(); - /** - * Returns the path to the file that should be used by the parser to access the file contents. - * For local translation units, this will return the equivalent to getLocation().toOSString() - * - * @since 5.2 - * @return String representing the path that should be used to obtain the file content. - * @see FileContent - */ - String getPathForFileContent(); - } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java index 61bd7407e77..edb4515f44e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java @@ -1133,11 +1133,4 @@ public class TranslationUnit extends Openable implements ITranslationUnit { public IWorkingCopy getSharedWorkingCopy(IProgressMonitor monitor, IBufferFactory factory) throws CModelException { return CModelManager.getDefault().getSharedWorkingCopy(factory, this, null, monitor); } - - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ITranslationUnit#getPathForFileContent() - */ - public String getPathForFileContent() { - return getLocation().toOSString(); - } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/FileContent.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/FileContent.java index 33bf8905e5d..fc66524d4dd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/FileContent.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/FileContent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Wind River Systems, Inc. and others. + * Copyright (c) 2009 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,7 +8,6 @@ * Contributors: * Markus Schorn - initial API and implementation * Sergey Prigogin (Google) - * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.core.parser; @@ -57,7 +56,7 @@ public abstract class FileContent { public static FileContent create(ITranslationUnit tu) { IPath location= tu.getLocation(); if (location == null) - return create(tu.getPathForFileContent(), tu.getContents()); + return create(tu.getElementName(), tu.getContents()); if (tu.isWorkingCopy()) { return create(location.toOSString(), tu.getContents());