[jbosstools-commits] JBoss Tools SVN: r42380 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2012-07-03 19:02:25 -0400 (Tue, 03 Jul 2012)
New Revision: 42380

Modified:
   trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
Log:
JBIDE-3526
https://issues.jboss.org/browse/JBIDE-3526
Vars defined externally for a page.





Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java	2012-07-03 22:27:16 UTC (rev 42379)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java	2012-07-03 23:02:25 UTC (rev 42380)
@@ -11,6 +11,7 @@
 package org.jboss.tools.common.el.core.resolver;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -24,6 +25,7 @@
  * @author Alexey Kazakov
  */
 public class ELContextImpl extends SimpleELContext {
+	static List<Var> EMPTY = Collections.<Var>emptyList();
 
 	protected List<Var> allVars = new ArrayList<Var>();
 	protected ELReference[] elReferences;
@@ -35,9 +37,22 @@
 	 */
 	@Override
 	public Var[] getVars() {
-		return allVars.toArray(new Var[allVars.size()]);
+		List<Var> external = getExternalVars();
+		if(external.isEmpty()) {
+			return allVars.toArray(new Var[allVars.size()]);
+		} else if(allVars.isEmpty()) {
+			return external.toArray(new Var[allVars.size()]);
+		}
+		ArrayList<Var> result = new ArrayList<Var>();
+		result.addAll(allVars);
+		result.addAll(external);
+		return result.toArray(new Var[allVars.size()]);
 	}
 
+	public List<Var> getExternalVars() {
+		return EMPTY;
+	}
+
 	/**
 	 * Adds new Var to the context
 	 * @param region
@@ -64,6 +79,10 @@
 				result.add(var);
 			}
 		}
+		List<Var> external = getExternalVars();
+		if(!external.isEmpty()) {
+			result.addAll(external);
+		}
 		return result.toArray(new Var[result.size()]);
 	}