mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 17:25:38 +02:00
Code Issues Wiki Activity

Undo part of the merge from 5.0.

Browse source
This commit is contained in:
Markus Schorn 2010-05-12 09:03:17 +00:00
parent 405b096fc0
commit 9bf851d6c9
4 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/org.eclipse.cdt.core/.settings/.api_filters
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><component id="org.eclipse.cdt.core" version="2"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.cdt.core" version="2">
<resource path="parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java" type="org.eclipse.cdt.core.dom.ast.IASTImplicitName"> <resource path="parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java" type="org.eclipse.cdt.core.dom.ast.IASTImplicitName">
<filter id="403853384"> <filter id="403853384">
<message_arguments> <message_arguments>
@ -41,12 +42,4 @@
</message_arguments> </message_arguments>
</filter> </filter>
</resource> </resource>
<resource path="src/org/eclipse/cdt/core/IFilesystemUtility.java" type="org.eclipse.cdt.core.IFilesystemUtility"> </component>
<filter id="1109393411">
<message_arguments>
<message_argument value="5.0.3"/>
<message_argument value="org.eclipse.cdt.core.IFilesystemUtility"/>
</message_arguments>
</filter>
</resource>
</component>

13
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java
View file

@ -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 * 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,7 +8,6 @@
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* IBM Corporation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.model; package org.eclipse.cdt.core.model;
@ -487,15 +486,5 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource
@Deprecated @Deprecated
org.eclipse.cdt.core.parser.CodeReader getCodeReader(); 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 <code>getLocation().toOSString()</code>
*
* @since 5.2
* @return String representing the path that should be used to obtain the file content.
* @see FileContent
*/
String getPathForFileContent();
} }

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

@ -1133,11 +1133,4 @@ public class TranslationUnit extends Openable implements ITranslationUnit {
public IWorkingCopy getSharedWorkingCopy(IProgressMonitor monitor, IBufferFactory factory) throws CModelException { public IWorkingCopy getSharedWorkingCopy(IProgressMonitor monitor, IBufferFactory factory) throws CModelException {
return CModelManager.getDefault().getSharedWorkingCopy(factory, this, null, monitor); return CModelManager.getDefault().getSharedWorkingCopy(factory, this, null, monitor);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.ITranslationUnit#getPathForFileContent()
*/
public String getPathForFileContent() {
return getLocation().toOSString();
}
} }

5
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/FileContent.java
View file

@ -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 * 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,7 +8,6 @@
* Contributors: * Contributors:
* Markus Schorn - initial API and implementation * Markus Schorn - initial API and implementation
* Sergey Prigogin (Google) * Sergey Prigogin (Google)
* IBM Corporation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.parser; package org.eclipse.cdt.core.parser;
@ -57,7 +56,7 @@ public abstract class FileContent {
public static FileContent create(ITranslationUnit tu) { public static FileContent create(ITranslationUnit tu) {
IPath location= tu.getLocation(); IPath location= tu.getLocation();
if (location == null) if (location == null)
return create(tu.getPathForFileContent(), tu.getContents()); return create(tu.getElementName(), tu.getContents());
if (tu.isWorkingCopy()) { if (tu.isWorkingCopy()) {
return create(location.toOSString(), tu.getContents()); return create(location.toOSString(), tu.getContents());