Author: dazarov
Date: 2010-01-13 10:58:24 -0500 (Wed, 13 Jan 2010)
New Revision: 19734
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RefactorSearcher.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5289
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RefactorSearcher.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RefactorSearcher.java 2010-01-13
15:52:04 UTC (rev 19733)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RefactorSearcher.java 2010-01-13
15:58:24 UTC (rev 19734)
@@ -165,8 +165,11 @@
private void scanForJava(IFile file){
if(isFileCorrect(file)) {
if(PROPERTIES_EXT.equalsIgnoreCase(file.getFileExtension())){
- String content = getFileContent(file);
- scanProperties(file, content);
+ if(file.getName().equals(SEAM_PROPERTIES_FILE)){
+ String content = getFileContent(file);
+ scanProperties(file, content);
+ }else
+ searchInCach(file);
} else if (JAVA_EXT.equalsIgnoreCase(file.getFileExtension())
|| JSP_EXT.equalsIgnoreCase(file.getFileExtension())
|| XHTML_EXT.equalsIgnoreCase(file.getFileExtension())
@@ -200,12 +203,14 @@
for(ELReference reference : references){
int offset = reference.getStartPosition();
for(ELExpression operand : reference.getEl()){
-
for (ELResolver resolver : resolvers) {
if (!(resolver instanceof ELCompletionEngine))
continue;
-
+
ELResolution resolution = resolver.resolve(context, operand, offset);
+
+ if(resolution == null)
+ continue;
List<ELSegment> segments =
resolution.findSegmentsByJavaElement(javaElement);
@@ -283,7 +288,7 @@
}
private void scanProperties(IFile file, String content){
- scanString(file, content, 0);
+ //scanString(file, content, 0);
if(!file.getName().equals(SEAM_PROPERTIES_FILE))
return;
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-01-13
15:52:04 UTC (rev 19733)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-01-13
15:58:24 UTC (rev 19734)
@@ -256,7 +256,7 @@
elReference.setResource(file);
elReference.setEl(new ELExpression[]{ie});
elReference.setLength(ie.getLength());
- elReference.setStartPosition(ie.getStartPosition());
+ elReference.setStartPosition(0);
List<SyntaxError> elErrors = new ArrayList<SyntaxError>();
for (SyntaxError error : errors) {
if(error.getPosition()>=ie.getStartPosition() &&
error.getPosition()<=ie.getEndPosition()) {