mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-05 08:46:02 +02:00
Cosmetics.
This commit is contained in:
parent
7660c4881e
commit
d62945a3d9
3 changed files with 9 additions and 18 deletions
|
@ -6,8 +6,8 @@
|
||||||
* http://www.eclipse.org/legal/epl-v10.html
|
* http://www.eclipse.org/legal/epl-v10.html
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* Markus Schorn - initial API and implementation
|
* Markus Schorn - initial API and implementation
|
||||||
* Sergey Prigogin (Google)
|
* Sergey Prigogin (Google)
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
package org.eclipse.cdt.core.index;
|
package org.eclipse.cdt.core.index;
|
||||||
|
|
||||||
|
|
|
@ -172,9 +172,6 @@ public class IndexFileSet implements IIndexFileSet {
|
||||||
return invert;
|
return invert;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.core.index.IIndexFileSet#invert()
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public IIndexFileSet invert() {
|
public IIndexFileSet invert() {
|
||||||
if (fInverse == null) {
|
if (fInverse == null) {
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
* http://www.eclipse.org/legal/epl-v10.html
|
* http://www.eclipse.org/legal/epl-v10.html
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* Andrew Ferguson (Symbian) - initial API and implementation
|
* Andrew Ferguson (Symbian) - initial API and implementation
|
||||||
* Markus Schorn (Wind River Systems)
|
* Markus Schorn (Wind River Systems)
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
package org.eclipse.cdt.internal.core.pdom.dom;
|
package org.eclipse.cdt.internal.core.pdom.dom;
|
||||||
|
|
||||||
|
@ -44,23 +44,20 @@ public class PDOMProjectIndexLocationConverter implements IIndexLocationConverte
|
||||||
fIgnoreExternal= ignoreWSExternal;
|
fIgnoreExternal= ignoreWSExternal;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.internal.core.pdom.dom.IIndexLocationConverter#fromInternalFormat(java.lang.String)
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public IIndexFileLocation fromInternalFormat(String raw) {
|
public IIndexFileLocation fromInternalFormat(String raw) {
|
||||||
String fullPath = null;
|
String fullPath = null;
|
||||||
URI uri= null;
|
URI uri= null;
|
||||||
if(raw.startsWith(EXTERNAL)) {
|
if (raw.startsWith(EXTERNAL)) {
|
||||||
try {
|
try {
|
||||||
uri = new URI(raw.substring(EXTERNAL.length()));
|
uri = new URI(raw.substring(EXTERNAL.length()));
|
||||||
} catch(URISyntaxException use) {
|
} catch (URISyntaxException e) {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (raw.startsWith(WS)) {
|
if (raw.startsWith(WS)) {
|
||||||
fullPath= raw.substring(WS.length());
|
fullPath= raw.substring(WS.length());
|
||||||
} else {
|
} else {
|
||||||
fullPath= fFullPathPrefix+raw;
|
fullPath= fFullPathPrefix + raw;
|
||||||
}
|
}
|
||||||
final IPath path= new Path(fullPath);
|
final IPath path= new Path(fullPath);
|
||||||
if (path.segmentCount() > 1) {
|
if (path.segmentCount() > 1) {
|
||||||
|
@ -71,13 +68,10 @@ public class PDOMProjectIndexLocationConverter implements IIndexLocationConverte
|
||||||
return uri == null ? null : new IndexFileLocation(uri, fullPath);
|
return uri == null ? null : new IndexFileLocation(uri, fullPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.internal.core.pdom.dom.IIndexLocationConverter#toRaw(java.net.URI)
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public String toInternalFormat(IIndexFileLocation location) {
|
public String toInternalFormat(IIndexFileLocation location) {
|
||||||
String fullPath= location.getFullPath();
|
String fullPath= location.getFullPath();
|
||||||
if(fullPath!=null) {
|
if (fullPath != null) {
|
||||||
if (fullPath.startsWith(fFullPathPrefix)) {
|
if (fullPath.startsWith(fFullPathPrefix)) {
|
||||||
return fullPath.substring(fFullPathPrefix.length());
|
return fullPath.substring(fFullPathPrefix.length());
|
||||||
}
|
}
|
||||||
|
@ -87,6 +81,6 @@ public class PDOMProjectIndexLocationConverter implements IIndexLocationConverte
|
||||||
if (fIgnoreExternal)
|
if (fIgnoreExternal)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
return EXTERNAL+location.getURI().toString();
|
return EXTERNAL + location.getURI().toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue