Author: dazarov
Date: 2009-10-16 06:17:02 -0400 (Fri, 16 Oct 2009)
New Revision: 18125
Modified:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/RenameMethodParticipant.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4856
Modified:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java 2009-10-16
10:10:39 UTC (rev 18124)
+++
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java 2009-10-16
10:17:02 UTC (rev 18125)
@@ -116,9 +116,12 @@
return projectSet.getViewFolder(project);
}
- IPath path =
ProjectHome.getFirstWebContentPath(baseFile.getProject()).removeFirstSegments(1);
+ IPath path = ProjectHome.getFirstWebContentPath(baseFile.getProject());
- return baseFile.getProject().getFolder(path);
+ if(path != null)
+ return project.getFolder(path.removeFirstSegments(1));
+
+ return null;
}
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/RenameMethodParticipant.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/RenameMethodParticipant.java 2009-10-16
10:10:39 UTC (rev 18124)
+++
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/RenameMethodParticipant.java 2009-10-16
10:17:02 UTC (rev 18125)
@@ -171,9 +171,12 @@
return projectSet.getViewFolder(project);
}
- IPath path =
ProjectHome.getFirstWebContentPath(baseFile.getProject()).removeFirstSegments(1);
+ IPath path = ProjectHome.getFirstWebContentPath(baseFile.getProject());
- return baseFile.getProject().getFolder(path);
+ if(path != null)
+ return project.getFolder(path.removeFirstSegments(1));
+
+ return null;
}
}