Author: dazarov
Date: 2009-10-16 06:04:02 -0400 (Fri, 16 Oct 2009)
New Revision: 18123
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4856
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-10-16
08:47:57 UTC (rev 18122)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-10-16
10:04:02 UTC (rev 18123)
@@ -298,11 +298,13 @@
if(expression instanceof ELPropertyInvocation){
ELPropertyInvocation pi = (ELPropertyInvocation)expression;
- return pi.getName().getStart();
+ if(pi.getName() != null)
+ return pi.getName().getStart();
}else if(expression instanceof ELMethodInvocation){
ELMethodInvocation mi = (ELMethodInvocation)expression;
- return mi.getName().getStart();
+ if(mi.getName() != null)
+ return mi.getName().getStart();
}
return 0;
}
@@ -311,11 +313,13 @@
if(expression instanceof ELPropertyInvocation){
ELPropertyInvocation pi = (ELPropertyInvocation)expression;
- return pi.getName().getLength();
+ if(pi.getName() != null)
+ return pi.getName().getLength();
}else if(expression instanceof ELMethodInvocation){
ELMethodInvocation mi = (ELMethodInvocation)expression;
- return mi.getName().getLength();
+ if(mi.getName() != null)
+ return mi.getName().getLength();
}
return 0;
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java 2009-10-16
08:47:57 UTC (rev 18122)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java 2009-10-16
10:04:02 UTC (rev 18123)
@@ -40,9 +40,12 @@
else if(project.equals(projectsSet.getEarProject()))
return projectsSet.getDefaultEarViewsFolder();
- IPath path = ProjectHome.getFirstWebContentPath(project).removeFirstSegments(1);
+ IPath path = ProjectHome.getFirstWebContentPath(project);
- return project.getFolder(path);
+ if(path != null)
+ return project.getFolder(path.removeFirstSegments(1));
+
+ return null;
}
}