Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Kucera2009-07-07 17:17:15 -0400
committerMike Kucera2009-07-07 17:17:15 -0400
commitdbe4360f9358daafd07761903e0acb0a1b2cab05 (patch)
tree988610ad74cd8001f362017c7a497be5b08f6809
parentcfb455de507602a19bb17787be1bb159a3b91e19 (diff)
downloadorg.eclipse.cdt-dbe4360f9358daafd07761903e0acb0a1b2cab05.tar.gz
org.eclipse.cdt-dbe4360f9358daafd07761903e0acb0a1b2cab05.tar.xz
org.eclipse.cdt-dbe4360f9358daafd07761903e0acb0a1b2cab05.zip
[282320] new class wizard doesn't work with EFS
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java
index 31b5f56476..31de55817f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java
@@ -502,8 +502,8 @@ public class NewClassCodeGenerator {
ICProject cProject = headerTU.getCProject();
IProject project = cProject.getProject();
- IPath projectLocation = project.getLocation();
- IPath headerLocation = headerTU.getResource().getLocation();
+ IPath projectLocation = new Path(project.getLocationURI().getPath());
+ IPath headerLocation = new Path(headerTU.getResource().getLocationURI().getPath());
List<IPath> includePaths = getIncludePaths(headerTU);
List<IPath> baseClassPaths = getBaseClassPaths(verifyBaseClasses());
@@ -610,7 +610,7 @@ public class NewClassCodeGenerator {
ICProject includeProject = PathUtil.getEnclosingProject(folderToAdd);
if (includeProject != null) {
// make sure that the include is made the same way that build properties for projects makes them, so .contains below is a valid check
- IIncludeEntry entry = CoreModel.newIncludeEntry(addToResourcePath, null, includeProject.getProject().getLocation(), true);
+ IIncludeEntry entry = CoreModel.newIncludeEntry(addToResourcePath, null, new Path(includeProject.getProject().getLocationURI().getPath()), true);
if (!checkEntryList.contains(entry)) // if the path already exists in the #includes then don't add it
pathEntryList.add(entry);
@@ -803,9 +803,10 @@ public class NewClassCodeGenerator {
private String getHeaderIncludeString(ITranslationUnit sourceTU, ITranslationUnit headerTU, StringBuffer text, IProgressMonitor monitor) {
IProject project = headerTU.getCProject().getProject();
- IPath projectLocation = project.getLocation();
- IPath headerLocation = headerTU.getResource().getLocation();
- IPath sourceLocation = sourceTU.getResource().getLocation();
+
+ IPath projectLocation = new Path(project.getLocationURI().getPath());
+ IPath headerLocation = new Path(headerTU.getResource().getLocationURI().getPath());
+ IPath sourceLocation = new Path(sourceTU.getResource().getLocationURI().getPath());
IPath includePath = PathUtil.makeRelativePathToProjectIncludes(headerLocation, project);
boolean isSystemIncludePath = false;

Back to the top