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

2005-07-06 Alain Magloire

Browse source 
PR 102622: OpenIncludeAction improvement, patch from: Robert O'Callahan
	* src/org/eclipse/cdt/internal/ui/OpenIncludeAction.java
This commit is contained in:
Alain Magloire 2005-07-06 14:56:14 +00:00
parent 03b2f1de71
commit 61aa8cb62c
2 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,7 @@
2005-07-06 Alain Magloire
PR 102622: OpenIncludeAction improvement, patch from: Robert O'Callahan
* src/org/eclipse/cdt/internal/ui/OpenIncludeAction.java
2005-07-06 Alain Magloire 2005-07-06 Alain Magloire
PR 102619: Performance improvement patch from: Robert O'Callahan PR 102619: Performance improvement patch from: Robert O'Callahan
* src/org/eclipse/cdt/ui/CElementContentProvider.java * src/org/eclipse/cdt/ui/CElementContentProvider.java

43
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java
View file

@ -6,7 +6,10 @@ package org.eclipse.cdt.internal.ui.editor;
*/ */
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
@ -74,7 +77,7 @@ public class OpenIncludeAction extends Action {
try { try {
IResource res = include.getUnderlyingResource(); IResource res = include.getUnderlyingResource();
ArrayList filesFound= new ArrayList(4); ArrayList filesFound = new ArrayList(4);
if (res != null) { if (res != null) {
IProject proj = res.getProject(); IProject proj = res.getProject();
String includeName = include.getElementName(); String includeName = include.getElementName();
@ -88,7 +91,8 @@ public class OpenIncludeAction extends Action {
} }
if (info != null) { if (info != null) {
String[] includePaths = info.getIncludePaths(); String[] includePaths = info.getIncludePaths();
findFile(includePaths, includeName, filesFound); HashSet found = new HashSet();
findFile(includePaths, includeName, filesFound, found);
} }
if (filesFound.size() == 0) { if (filesFound.size() == 0) {
// Fall back and search the project // Fall back and search the project
@ -136,12 +140,43 @@ public class OpenIncludeAction extends Action {
errorMsg.open(); errorMsg.open();
} }
private void findFile(String[] includePaths, String name, ArrayList list) throws CoreException { private boolean isInProject(IPath path) {
return ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path) != null;
}
// If 'path' is not a resource in the current workspace and
// it is a symlink to a resource that is in the current workspace,
// use the symlink target instead
private IPath resolveIncludeLink(File file, IPath path) {
if (isInProject(path))
return path;
try {
String canon = file.getCanonicalPath();
if (canon.equals(file.getAbsolutePath()))
return path;
IPath p = Path.fromOSString(canon);
if (isInProject(p))
return p;
} catch (IOException e) {
// Do nothing; the path is not resolved
}
return path;
}
private void findFile(String[] includePaths, String name, ArrayList list,
HashSet foundSet) throws CoreException {
for (int i = 0; i < includePaths.length; i++) { for (int i = 0; i < includePaths.length; i++) {
IPath path = new Path(includePaths[i] + "/" + name); //$NON-NLS-1$ IPath path = new Path(includePaths[i] + "/" + name); //$NON-NLS-1$
File file = path.toFile(); File file = path.toFile();
if (file.exists()) { if (file.exists()) {
list.add(path); IPath p = resolveIncludeLink(file, path);
if (!foundSet.contains(p)) {
foundSet.add(p);
list.add(p);
}
} }
} }
} }