Author: lryan
Date: Wed Feb 11 23:27:59 2009
New Revision: 743562
URL: http://svn.apache.org/viewvc?rev=743562&view=rev
Log:
Make Expressions available to subclasses of JsonContainerConfig
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java?rev=743562&r1=743561&r2=743562&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
Wed Feb 11 23:27:59 2009
@@ -23,6 +23,12 @@
import org.apache.shindig.common.JsonSerializer;
import org.apache.shindig.common.util.ResourceLoader;
import org.apache.shindig.expressions.Expressions;
+
+import com.google.common.collect.Maps;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -42,11 +48,6 @@
import javax.el.ELException;
import javax.el.ValueExpression;
-import com.google.common.collect.Maps;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.name.Named;
-
/**
* Represents a container configuration using JSON notation.
*
@@ -131,10 +132,17 @@
}
/**
+ * Make Expressions available to subclasses so they can create ELContexts
+ */
+ protected Expressions getExpressions() {
+ return expressions;
+ }
+
+ /**
* Protected to allow overriding.
*/
protected ELContext createExpressionContext(String container) {
- return expressions.newELContext(new ContainerConfigELResolver(this,
container));
+ return getExpressions().newELContext(new ContainerConfigELResolver(this,
container));
}
/**
