aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzzhongwei2013-02-03 23:06:19 (EST)
committerzzhongwei2013-02-03 23:25:38 (EST)
commitcc2f4be82bc2791ae9c5ce7432fc7b200ea6bbd3 (patch)
treef867f23d36a0a39642473954d45a1f359b26545d
parent8b1a5fc95f6ee4ed350b68e147c97c92a59a4711 (diff)
downloadorg.eclipse.pdt-cc2f4be82bc2791ae9c5ce7432fc7b200ea6bbd3.zip
org.eclipse.pdt-cc2f4be82bc2791ae9c5ce7432fc7b200ea6bbd3.tar.gz
org.eclipse.pdt-cc2f4be82bc2791ae9c5ce7432fc7b200ea6bbd3.tar.bz2
Bug 387167 - Removing project from Include path doesn't remove it from
.buildpath
-rw-r--r--plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/includepath/IncludePathManager.java30
1 files changed, 17 insertions, 13 deletions
diff --git a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/includepath/IncludePathManager.java b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/includepath/IncludePathManager.java
index 5a4159e..7ef41fe 100644
--- a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/includepath/IncludePathManager.java
+++ b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/includepath/IncludePathManager.java
@@ -241,8 +241,8 @@ public class IncludePathManager {
.getEntry();
IPath localPath = EnvironmentPathUtils.getLocalPath(entry
.getPath());
- buf.append(entry.getEntryKind()).append(';').append(
- localPath.toString());
+ buf.append(entry.getEntryKind()).append(';')
+ .append(localPath.toString());
} else {
IResource entry = (IResource) includePath.getEntry();
buf.append("0;").append(entry.getFullPath().toString());
@@ -272,10 +272,10 @@ public class IncludePathManager {
public static boolean isBuildpathAllowed(IBuildpathEntry entry) {
return ((entry.getEntryKind() == IBuildpathEntry.BPE_CONTAINER && !entry
- .getPath().toString().equals(
- LanguageModelInitializer.CONTAINER_PATH))
+ .getPath().toString()
+ .equals(LanguageModelInitializer.CONTAINER_PATH))
|| entry.getEntryKind() == IBuildpathEntry.BPE_LIBRARY || entry
- .getEntryKind() == IBuildpathEntry.BPE_PROJECT);
+ .getEntryKind() == IBuildpathEntry.BPE_PROJECT);
}
/**
@@ -312,13 +312,15 @@ public class IncludePathManager {
}
// update the include path for this project
- setIncludePath(project, newIncludePathEntries
- .toArray(new IncludePath[newIncludePathEntries.size()]));
+ setIncludePath(project,
+ newIncludePathEntries
+ .toArray(new IncludePath[newIncludePathEntries.size()]));
// if it's a library, remove it also from build path
IScriptProject scriptProject = DLTKCore.create(project);
- if ((buildpathEntry.getEntryKind() == IBuildpathEntry.BPE_LIBRARY || buildpathEntry
- .getEntryKind() == IBuildpathEntry.BPE_CONTAINER)) {
+ if ((buildpathEntry.getEntryKind() == IBuildpathEntry.BPE_LIBRARY
+ || buildpathEntry.getEntryKind() == IBuildpathEntry.BPE_CONTAINER || buildpathEntry
+ .getEntryKind() == IBuildpathEntry.BPE_PROJECT)) {
BuildPathUtils.removeEntryFromBuildPath(scriptProject,
buildpathEntry);
}
@@ -348,8 +350,9 @@ public class IncludePathManager {
}
}
// update the include path for this project
- setIncludePath(project, includePathEntries
- .toArray(new IncludePath[includePathEntries.size()]));
+ setIncludePath(project,
+ includePathEntries.toArray(new IncludePath[includePathEntries
+ .size()]));
}
/**
@@ -379,8 +382,9 @@ public class IncludePathManager {
.getInstance().getIncludePaths(project)));
// update the include path for this project
- setIncludePath(project, includePathEntries
- .toArray(new IncludePath[includePathEntries.size()]));
+ setIncludePath(project,
+ includePathEntries.toArray(new IncludePath[includePathEntries
+ .size()]));
}
/**