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

Removed core and impl package.

Browse source
This commit is contained in:
Willem Cazander 2013-04-07 01:14:45 +02:00
parent f2844c61f2
commit b4225f6b0c
107 changed files with 612 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

22
x4o-meta/src/main/java/org/x4o/xml/meta/MetaLanguageSiblingLoader.java
View file

@ -23,12 +23,12 @@
package org.x4o.xml.meta;
import org.x4o.xml.core.config.X4OLanguageLoader;
import org.x4o.xml.core.config.X4OLanguageLoaderException;
import org.x4o.xml.core.config.X4OLanguageLocal;
import org.x4o.xml.element.ElementLanguageModule;
import org.x4o.xml.element.ElementLanguageModuleLoaderException;
import org.x4o.xml.element.ElementLanguageModuleLoaderSibling;
import org.x4o.xml.lang.X4OLanguageModule;
import org.x4o.xml.lang.X4OLanguageModuleLoaderException;
import org.x4o.xml.lang.X4OLanguageModuleLoaderSibling;
import org.x4o.xml.lang.X4OLanguageLoader;
import org.x4o.xml.lang.X4OLanguageLoaderException;
import org.x4o.xml.lang.X4OLanguageLocal;
/**
* MetaLanguageSiblingLoader loads the generic x4o meta language into defined language.
@ -36,7 +36,7 @@ import org.x4o.xml.element.ElementLanguageModuleLoaderSibling;
* @author Willem Cazander
* @version 1.0 Aug 7, 2012
*/
public class MetaLanguageSiblingLoader implements ElementLanguageModuleLoaderSibling {
public class MetaLanguageSiblingLoader implements X4OLanguageModuleLoaderSibling {
/** Defines the identifier of the meta x4o language. */
public static final String META_LANGUAGE = "meta";
@ -48,10 +48,10 @@ public class MetaLanguageSiblingLoader implements ElementLanguageModuleLoaderSib
* Loads an ElementLanguageModule.
* @param language The ElementLanguage to load for.
* @param elementLanguageModule The ElementLanguageModule to load into.
* @throws ElementLanguageModuleLoaderException Is thrown when meta language could not be loaded.
* @see org.x4o.xml.element.ElementLanguageModuleLoader#loadLanguageModule(org.x4o.xml.element.ElementLanguage, org.x4o.xml.element.ElementLanguageModule)
* @throws X4OLanguageModuleLoaderException Is thrown when meta language could not be loaded.
* @see org.x4o.xml.lang.X4OLanguageModuleLoader#loadLanguageModule(org.x4o.xml.element.ElementLanguage, org.x4o.xml.lang.X4OLanguageModule)
*/
public void loadLanguageModule(X4OLanguageLocal languageLocal,ElementLanguageModule elementLanguageModule) throws ElementLanguageModuleLoaderException {
public void loadLanguageModule(X4OLanguageLocal languageLocal,X4OLanguageModule elementLanguageModule) throws X4OLanguageModuleLoaderException {
elementLanguageModule.setId(META_LANGUAGE);
elementLanguageModule.setName(META_LANGUAGE);
elementLanguageModule.setProviderName(MetaLanguageSiblingLoader.class.getSimpleName());
@ -63,7 +63,7 @@ public class MetaLanguageSiblingLoader implements ElementLanguageModuleLoaderSib
* @param elementLanguage The ElementLanguage to load for.
* @param loader The x4o language loader.
* @throws X4OLanguageLoaderException
* @see org.x4o.xml.element.ElementLanguageModuleLoaderSibling#loadLanguageSibling(org.x4o.xml.element.ElementLanguage, org.x4o.xml.core.config.X4OLanguageLoader)
* @see org.x4o.xml.lang.X4OLanguageModuleLoaderSibling#loadLanguageSibling(org.x4o.xml.element.ElementLanguage, org.x4o.xml.lang.X4OLanguageLoader)
*/
public void loadLanguageSibling(X4OLanguageLocal languageLocal,X4OLanguageLoader loader) throws X4OLanguageLoaderException {

2
x4o-meta/src/main/java/org/x4o/xml/meta/lang/BeanPropertyComparator.java
View file

@ -27,7 +27,7 @@ import java.util.Comparator;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.x4o.xml.impl.DefaultElementObjectPropertyValue;
import org.x4o.xml.element.DefaultElementObjectPropertyValue;
/**

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

@ -54,8 +54,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.getElementLanguage().getExpressionFactory().createValueExpression(element.getElementLanguage().getELContext(),"${"+attributeValue+"}", element.getElementObject().getClass());
ValueExpression ee = element.getElementLanguage().getExpressionLanguageFactory().createValueExpression(element.getElementLanguage().getExpressionLanguageContext(),"${"+attributeValue+"}", element.getElementObject().getClass());
Logger.getLogger(ELIDAttributeHandler.class.getName()).finer("Set Variable in ELContext: "+"${"+attributeValue+"}"+" object SET: "+element.getElementObject());
ee.setValue(element.getElementLanguage().getELContext(), element.getElementObject());
ee.setValue(element.getElementLanguage().getExpressionLanguageContext(), element.getElementObject());
}
}

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

@ -44,8 +44,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 = getElementLanguage().getExpressionFactory().createValueExpression(getElementLanguage().getELContext(),"${"+attributeValue+"}",Object.class);
ValueExpression ee = getElementLanguage().getExpressionLanguageFactory().createValueExpression(getElementLanguage().getExpressionLanguageContext(),"${"+attributeValue+"}",Object.class);
Logger.getLogger(ELReferenceElement.class.getName()).finer("Get Variable in ELContext: ${"+attributeValue+"}");
setElementObject(ee.getValue(getElementLanguage().getELContext()));
setElementObject(ee.getValue(getElementLanguage().getExpressionLanguageContext()));
}
}

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

@ -25,9 +25,9 @@ package org.x4o.xml.meta;
import java.util.Date;
import org.x4o.xml.core.config.X4OLanguagePropertyKeys;
import org.x4o.xml.element.ElementLanguage;
import org.x4o.xml.io.X4OReaderContext;
import org.x4o.xml.lang.X4OLanguageContext;
import org.x4o.xml.lang.X4OLanguagePropertyKeys;
import org.x4o.xml.meta.test.MTestDriver;
import junit.framework.TestCase;
@ -41,7 +41,7 @@ import junit.framework.TestCase;
public class ReferenceStoreTest extends TestCase {
public void testMetaGeneric() throws Exception {
ElementLanguage context = null;
X4OLanguageContext context = null;
MTestDriver driver = new MTestDriver();
X4OReaderContext<?> reader = driver.createReaderContext();
reader.setProperty(X4OLanguagePropertyKeys.PHASE_SKIP_RELEASE, true);
@ -54,7 +54,7 @@ public class ReferenceStoreTest extends TestCase {
}
public void testLoadClass() throws Exception {
ElementLanguage context = null;
X4OLanguageContext context = null;
MTestDriver driver = new MTestDriver();
X4OReaderContext<?> reader = driver.createReaderContext();
reader.setProperty(X4OLanguagePropertyKeys.PHASE_SKIP_RELEASE, true);
@ -67,7 +67,7 @@ public class ReferenceStoreTest extends TestCase {
}
public void testStoreRef() throws Exception {
ElementLanguage context = null;
X4OLanguageContext context = null;
MTestDriver driver = new MTestDriver();
X4OReaderContext<?> reader = driver.createReaderContext();
reader.setProperty(X4OLanguagePropertyKeys.PHASE_SKIP_RELEASE, true);

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

@ -25,12 +25,12 @@ package org.x4o.xml.meta.test;
import org.x4o.xml.X4ODriver;
import org.x4o.xml.X4ODriverManager;
import org.x4o.xml.core.config.DefaultX4OLanguage;
import org.x4o.xml.core.config.DefaultX4OLanguageConfiguration;
import org.x4o.xml.core.config.X4OLanguage;
import org.x4o.xml.core.phase.X4OPhaseManagerFactory;
import org.x4o.xml.io.X4OReaderContext;
import org.x4o.xml.io.X4OWriterContext;
import org.x4o.xml.lang.DefaultX4OLanguage;
import org.x4o.xml.lang.DefaultX4OLanguageConfiguration;
import org.x4o.xml.lang.X4OLanguage;
import org.x4o.xml.lang.phase.X4OPhaseManagerFactory;
public class MTestDriver extends X4ODriver {