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

Fixed loader bug and refactory module with local interface and removed

Browse source 
loader object from language tree.
This commit is contained in:
Willem Cazander 2014-03-07 15:26:54 +01:00
parent 5f08acb488
commit cad493bc69
14 changed files with 315 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,12 +22,12 @@
*/
package org.x4o.xml.lang.meta;
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;
import org.x4o.xml.lang.X4OLanguageModuleLocal;
/**
* MetaLanguageSiblingLoader loads the generic x4o meta language into defined language.
@ -56,7 +56,7 @@ public class MetaLanguageSiblingLoader implements X4OLanguageModuleLoaderSibling
* @throws X4OLanguageModuleLoaderException Is thrown when meta language could not be loaded.
* @see org.x4o.xml.lang.X4OLanguageModuleLoader#loadLanguageModule(org.x4o.xml.lang.X4OLanguageLocal, org.x4o.xml.lang.X4OLanguageModule)
*/
public void loadLanguageModule(X4OLanguageLocal language,X4OLanguageModule languageModule) throws X4OLanguageModuleLoaderException {
public void loadLanguageModule(X4OLanguageLocal language,X4OLanguageModuleLocal languageModule) throws X4OLanguageModuleLoaderException {
languageModule.setId(META_LANGUAGE);
languageModule.setProviderHost(META_LANGUAGE_HOST);
languageModule.setProviderName(MetaLanguageSiblingLoader.class.getSimpleName());

4
x4o-meta/src/test/resources/META-INF/mtest/mtest-lang.eld
View file

@ -29,8 +29,8 @@
xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
providerName="mtest.x4o.org"
name="Meta Test Language"
providerHost="mtest.x4o.org"
providerName="Meta Test Language"
id="mtest-lang"
>
<eld:namespace