ff-attic/x4o
2
Fork 0
Code Issues 2 Pull requests Activity

Renamed X4OLanguageContext to X4OLanguageSession

Browse source
This commit is contained in:
Willem Cazander 2013-08-24 19:30:58 +02:00
parent b1193b9051
commit 4e9052244c
58 changed files with 412 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x4o-meta/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java
View file

@ -53,8 +53,8 @@ public class ELIDAttributeHandler extends AbstractElementAttributeHandler {
return;
}
if(element.getElementObject()==null) { throw new NullPointerException("Can't bind null object to el context"); }
ValueExpression ee = element.getLanguageContext().getExpressionLanguageFactory().createValueExpression(element.getLanguageContext().getExpressionLanguageContext(),"${"+attributeValue+"}", element.getElementObject().getClass());
ValueExpression ee = element.getLanguageSession().getExpressionLanguageFactory().createValueExpression(element.getLanguageSession().getExpressionLanguageContext(),"${"+attributeValue+"}", element.getElementObject().getClass());
Logger.getLogger(ELIDAttributeHandler.class.getName()).finer("Set Variable in ELContext: "+"${"+attributeValue+"}"+" object SET: "+element.getElementObject());
ee.setValue(element.getLanguageContext().getExpressionLanguageContext(), element.getElementObject());
ee.setValue(element.getLanguageSession().getExpressionLanguageContext(), element.getElementObject());
}
}

4
x4o-meta/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java
View file

@ -43,8 +43,8 @@ public class ELReferenceElement extends AbstractElement {
public void doElementRun() throws ElementException {
String attributeValue = getAttributes().get("el.ref");
if("".equals(attributeValue) | attributeValue==null) { throw new ElementException("Set the el.ref attribute"); }
ValueExpression ee = getLanguageContext().getExpressionLanguageFactory().createValueExpression(getLanguageContext().getExpressionLanguageContext(),"${"+attributeValue+"}",Object.class);
ValueExpression ee = getLanguageSession().getExpressionLanguageFactory().createValueExpression(getLanguageSession().getExpressionLanguageContext(),"${"+attributeValue+"}",Object.class);
Logger.getLogger(ELReferenceElement.class.getName()).finer("Get Variable in ELContext: ${"+attributeValue+"}");
setElementObject(ee.getValue(getLanguageContext().getExpressionLanguageContext()));
setElementObject(ee.getValue(getLanguageSession().getExpressionLanguageContext()));
}
}

4
x4o-meta/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java
View file

@ -64,7 +64,7 @@ public class PropertyElement extends AbstractElement {
// convert value object
try {
value = getLanguageContext().getElementAttributeValueParser().getParameterValue(name,valueString,this);
value = getLanguageSession().getElementAttributeValueParser().getParameterValue(name,valueString,this);
} catch (ObjectConverterException ece) {
throw new ElementException(ece);
}
@ -101,7 +101,7 @@ public class PropertyElement extends AbstractElement {
// try to set as property on bean.
try {
getLanguageContext().getElementObjectPropertyValue().setProperty(getParent().getElementObject(), name, value);
getLanguageSession().getElementObjectPropertyValue().setProperty(getParent().getElementObject(), name, value);
return;
} catch (Exception e) {
throw new ElementException("Could not set property on parent element object: "+name,e);

4
x4o-meta/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java
View file

@ -27,7 +27,7 @@ import javax.swing.JLabel;
import org.x4o.xml.element.DefaultElement;
import org.x4o.xml.element.Element;
import org.x4o.xml.io.X4OReaderContext;
import org.x4o.xml.lang.X4OLanguageContext;
import org.x4o.xml.lang.X4OLanguageSession;
import org.x4o.xml.lang.phase.X4OPhase;
import junit.framework.TestCase;
@ -41,7 +41,7 @@ import junit.framework.TestCase;
public class ParentObjectTest extends TestCase {
public void testParentElement() throws Exception {
X4OLanguageContext context = null;
X4OLanguageSession context = null;
MTestDriver driver = new MTestDriver();
X4OReaderContext<?> reader = driver.createReaderContext();
reader.addPhaseSkip(X4OPhase.READ_RELEASE);

8
x4o-meta/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java
View file

@ -25,7 +25,7 @@ package org.x4o.xml.lang.meta;
import java.util.Date;
import org.x4o.xml.io.X4OReaderContext;
import org.x4o.xml.lang.X4OLanguageContext;
import org.x4o.xml.lang.X4OLanguageSession;
import org.x4o.xml.lang.phase.X4OPhase;
import junit.framework.TestCase;
@ -39,7 +39,7 @@ import junit.framework.TestCase;
public class ReferenceStoreTest extends TestCase {
public void testMetaGeneric() throws Exception {
X4OLanguageContext context = null;
X4OLanguageSession context = null;
MTestDriver driver = new MTestDriver();
X4OReaderContext<?> reader = driver.createReaderContext();
reader.addPhaseSkip(X4OPhase.READ_RELEASE);
@ -52,7 +52,7 @@ public class ReferenceStoreTest extends TestCase {
}
public void testLoadClass() throws Exception {
X4OLanguageContext context = null;
X4OLanguageSession context = null;
MTestDriver driver = new MTestDriver();
X4OReaderContext<?> reader = driver.createReaderContext();
reader.addPhaseSkip(X4OPhase.READ_RELEASE);
@ -65,7 +65,7 @@ public class ReferenceStoreTest extends TestCase {
}
public void testStoreRef() throws Exception {
X4OLanguageContext context = null;
X4OLanguageSession context = null;
MTestDriver driver = new MTestDriver();
X4OReaderContext<?> reader = driver.createReaderContext();
reader.addPhaseSkip(X4OPhase.READ_RELEASE);