[jbosstools-commits] JBoss Tools SVN: r42446 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: include and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2012-07-06 18:08:39 -0400 (Fri, 06 Jul 2012)
New Revision: 42446

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/include/IncludeModel.java
Log:
JBIDE-12295
https://issues.jboss.org/browse/JBIDE-12295
Open-on for variable declared by ui:param.

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	2012-07-06 22:05:56 UTC (rev 42445)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java	2012-07-06 22:08:39 UTC (rev 42446)
@@ -643,6 +643,7 @@
 			start = node.getStartOffset();
 			length = node.getEndOffset() - start;
 
+			var.setFile(context.getResource());
 			context.addVar(new Region(start, length), var);
 		}
 	}
@@ -685,21 +686,21 @@
 					if(element.hasAttribute(ATTR_NAME)) {
 						String var = element.getAttribute(ATTR_NAME);
 						int declOffset = 0;
-						int declLength = 0;
+						int length = 0;
 						Node varAttr = element.getAttributeNode(ATTR_NAME); 
 						if (varAttr instanceof IDOMAttr) {
-							int varNameStart = ((IDOMAttr)varAttr).getNameRegionStartOffset();
-							int varNameEnd = ((IDOMAttr)varAttr).getNameRegionEndOffset();
-							declOffset = varNameStart;
-							declLength = varNameEnd - varNameStart;
+							int varStart = ((IDOMAttr)varAttr).getValueRegionStartOffset() + 1;
+							declOffset = varStart;
+							length = var.length();
 						}
 						var = var.trim();
 						if(!"".equals(var)) { //$NON-NLS-1$					
 							if(element.hasAttribute(ATTR_VALUE)) {
 								String value = element.getAttribute(ATTR_VALUE);
 								value = value.trim();
-								Var newVar = new Var(ELParserUtil.getJbossFactory(), var, value, declOffset, declLength);
+								Var newVar = new Var(ELParserUtil.getJbossFactory(), var, value, declOffset, length);
 								if(newVar.getElToken()!=null) {
+									newVar.setFile(context.getResource());
 									if(vars == null) {
 										vars = new ArrayList<Var>();
 									}

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java	2012-07-06 22:05:56 UTC (rev 42445)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java	2012-07-06 22:08:39 UTC (rev 42446)
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.jboss.tools.common.el.core.ELReference;
@@ -149,6 +150,9 @@
 					String name = v.getAttribute(STORE_ATTR_NAME);
 					String value = v.getAttribute(STORE_ATTR_VALUE);
 					Var var = new Var(ELParserUtil.getJbossFactory(), name, value, 0, 0);  //TODO
+					if(path.segmentCount() > 1) {
+						var.setFile(ResourcesPlugin.getWorkspace().getRoot().getFile(path));
+					}
 					vars.add(var);
 				}
 				path1 = ELReference.getPath(pathAliases, path1);