[jbosstools-commits] JBoss Tools SVN: r25518 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb and 1 other directory.
Author: akazakov
Date: 2010-10-06 08:13:50 -0400 (Wed, 06 Oct 2010)
New Revision: 25518
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-7264
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java 2010-10-06
12:06:59 UTC (rev 25517)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java 2010-10-06
12:13:50 UTC (rev 25518)
@@ -134,6 +134,14 @@
return source;
}
+ public int getStartPossitionOfFirstEL() {
+ ELExpression[] els = getEl();
+ if(els.length>0) {
+ return startPosition + els[0].getStartPosition();
+ }
+ return startPosition;
+ }
+
/**
* @return the el
*/
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-10-06
12:06:59 UTC (rev 25517)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-10-06
12:13:50 UTC (rev 25518)
@@ -578,8 +578,7 @@
if(is.size()==1) {
elReference.setLineNumber(document.getLineOfOffset(elReference.getStartPossitionOfFirstEL())
+ 1);
}
- }
- else {
+ } else {
elReference.setLineNumber(document.getLineOfOffset(offset) + 1);
}
} catch (BadLocationException e) {